Merge branch 'master' into terencehill/ca_fixes_and_more

diff --cc gamemodes.cfg
Simple merge

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

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

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

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

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

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

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

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