Merge remote-tracking branch 'origin/master' into Juhu/scoreboard-strafe

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

diff --cc qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
Simple merge

diff --cc qcsrc/server/_mod.inc
index b2139aa90b3805b7377f63cfc3146cb87bbe0cf9,34ca1e2c85d664ee07c2ce53177c03945a39f22e..345b1d3eb1b8c366406df1ff9f41f9b13bb49c0e
--- 1/qcsrc/server/_mod.inc
--- 2/qcsrc/server/_mod.inc
+++ b/qcsrc/server/_mod.inc
@@@ -25,9 -26,9 +26,10 @@@
  #include <server/scores_rules.qc>
  #include <server/spawnpoints.qc>
  #include <server/steerlib.qc>
 +#include <server/strafe.qc>
  #include <server/teamplay.qc>
  #include <server/tests.qc>
+ #include <server/world.qc>
  
  #include <server/bot/_mod.inc>
  #include <server/command/_mod.inc>

diff --cc qcsrc/server/_mod.qh
index 7303455197a7355575cf0e23ae1bb08f45c28c4e,c997538266a8c1be093b43556118d63baa601311..2c7bbe404271adf80e3bc7fccb623d0bafa05697
--- 1/qcsrc/server/_mod.qh
--- 2/qcsrc/server/_mod.qh
+++ b/qcsrc/server/_mod.qh
@@@ -25,9 -26,9 +26,10 @@@
  #include <server/scores_rules.qh>
  #include <server/spawnpoints.qh>
  #include <server/steerlib.qh>
 +#include <server/strafe.qh>
  #include <server/teamplay.qh>
  #include <server/tests.qh>
+ #include <server/world.qh>
  
  #include <server/bot/_mod.qh>
  #include <server/command/_mod.qh>