Merge branch 'master' into Lyberta/PlayerTemplates

diff --cc qcsrc/server/_mod.inc
index 62e4cd3a2b0f19d47bfdad7ab8fb3d3a0d8ef572,a4cb8bd5e1c5779b2274a01448ceeb39a689c867..5ccd2991458fe920b7f19f0c45b78b4005e3253b
--- 1/qcsrc/server/_mod.inc
--- 2/qcsrc/server/_mod.inc
+++ b/qcsrc/server/_mod.inc
@@@ -16,8 -16,6 +16,7 @@@
  #include <server/matrix.qc>
  #include <server/miscfunctions.qc>
  #include <server/player.qc>
- #include <server/playerdemo.qc>
 +#include <server/player_templates.qc>
  #include <server/portals.qc>
  #include <server/race.qc>
  #include <server/resources.qc>

diff --cc qcsrc/server/_mod.qh
index 233a4a7a68a04f444e4758d9ab867c149e71c886,0a00d680786fa51c84701339d0b9f82fe01000aa..8be7fefd4b38ec6cff7ee1a0232283365bbc74f0
--- 1/qcsrc/server/_mod.qh
--- 2/qcsrc/server/_mod.qh
+++ b/qcsrc/server/_mod.qh
@@@ -16,8 -16,6 +16,7 @@@
  #include <server/matrix.qh>
  #include <server/miscfunctions.qh>
  #include <server/player.qh>
- #include <server/playerdemo.qh>
 +#include <server/player_templates.qh>
  #include <server/portals.qh>
  #include <server/race.qh>
  #include <server/resources.qh>