Merge branch 'master' into terencehill/gameover_stuff

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

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

diff --cc qcsrc/common/stats.qh
Simple merge

diff --cc qcsrc/server/bot/default/bot.qc
Simple merge

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

diff --cc qcsrc/server/command/vote.qc
Simple merge

diff --cc qcsrc/server/defs.qh
Simple merge

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

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

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

diff --cc qcsrc/server/mutators/mutator/gamemode_assault.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
Simple merge

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

diff --cc qcsrc/server/weapons/weaponsystem.qc
Simple merge