Merge branch 'master' into Mario/race_cts_mutators

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

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

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

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

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

diff --cc qcsrc/server/progs.src
index 9426d2d7413584b93dd8af4046d0878c3a257a15,812a1d390a000439b14d08f16032bb2d7a303b9d..07683fc16680bcad7385ec3a538f2590d47d7c05
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -48,10 -50,9 +50,11 @@@ mutators/gamemode_keepaway.q
  mutators/gamemode_nexball.qh 
  mutators/gamemode_lms.qh
  mutators/gamemode_invasion.qh
 +mutators/gamemode_cts.qh
 +mutators/gamemode_race.qh
  mutators/mutator_dodging.qh
  mutators/mutator_nades.qh
+ mutators/mutator_buffs.qh
  
  //// tZork Turrets ////
  tturrets/include/turrets_early.qh

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