Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes

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

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

diff --cc qcsrc/server/progs.src
Simple merge

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