Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates

diff --cc qcsrc/server/_mod.inc
index 204d81e5c53b650f347c27cdc5a17ba242baf4be,99115fbdc4fcaa48d2b3b33f8aca6458d530d718..47cea84122971970d2241ab020fd88e97cd550dc
--- 1/qcsrc/server/_mod.inc
--- 2/qcsrc/server/_mod.inc
+++ b/qcsrc/server/_mod.inc
@@@ -18,9 -18,9 +18,10 @@@
  #include <server/miscfunctions.qc>
  #include <server/player.qc>
  #include <server/playerdemo.qc>
 +#include <server/playertemplates.qc>
  #include <server/portals.qc>
  #include <server/race.qc>
+ #include <server/resources.qc>
  #include <server/round_handler.qc>
  #include <server/scores.qc>
  #include <server/scores_rules.qc>

diff --cc qcsrc/server/_mod.qh
index 9092faafc0bbc86fb0aca94d55a3125e02334917,3a8898670354511f40a1e515d25aeae0d5b28068..6f7c0e796c053094521abd2e4cde065bf646558d
--- 1/qcsrc/server/_mod.qh
--- 2/qcsrc/server/_mod.qh
+++ b/qcsrc/server/_mod.qh
@@@ -18,9 -18,9 +18,10 @@@
  #include <server/miscfunctions.qh>
  #include <server/player.qh>
  #include <server/playerdemo.qh>
 +#include <server/playertemplates.qh>
  #include <server/portals.qh>
  #include <server/race.qh>
+ #include <server/resources.qh>
  #include <server/round_handler.qh>
  #include <server/scores.qh>
  #include <server/scores_rules.qh>