Merge branch 'master' into Mario/misc_tweaks

diff --cc qcsrc/client/announcer.qc
Simple merge

diff --cc qcsrc/client/main.qc
Simple merge

diff --cc qcsrc/client/main.qh
Simple merge

diff --cc qcsrc/client/view.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge

diff --cc qcsrc/common/util.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/arc.qc
Simple merge

diff --cc qcsrc/server/client.qc
Simple merge

diff --cc qcsrc/server/intermission.qc
Simple merge

diff --cc qcsrc/server/scores.qc
Simple merge

diff --cc qcsrc/server/world.qc
Simple merge