Merge branch 'Lyberta/Survival' into Lyberta/master

diff --cc qcsrc/common/gamemodes/gamemode/_mod.inc
index 6cec1df9234e455ccc86742dfa5877a4964e6bbc,6056ba7cc278187d43b0b166cb9abda348803933..866e16227928c9e3c25826a8284c71b85652acaa
--- 1/qcsrc/common/gamemodes/gamemode/_mod.inc
--- 2/qcsrc/common/gamemodes/gamemode/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/_mod.inc
@@@ -1,5 -1,5 +1,6 @@@
  // generated file; do not modify
  
 +#include <common/gamemodes/gamemode/gungame/_mod.inc>
  #include <common/gamemodes/gamemode/nexball/_mod.inc>
  #include <common/gamemodes/gamemode/onslaught/_mod.inc>
+ #include <common/gamemodes/gamemode/survival/_mod.inc>

diff --cc qcsrc/common/gamemodes/gamemode/_mod.qh
index f06b224d8fecf6f81ad0c446c38e5b482ce5c7b2,333d341709b9d1129dab243c7e23559c15f1bf6b..f4c598f697af8f0cb85c1eeec5ff5d2be982c4db
--- 1/qcsrc/common/gamemodes/gamemode/_mod.qh
--- 2/qcsrc/common/gamemodes/gamemode/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/_mod.qh
@@@ -1,5 -1,5 +1,6 @@@
  // generated file; do not modify
  
 +#include <common/gamemodes/gamemode/gungame/_mod.qh>
  #include <common/gamemodes/gamemode/nexball/_mod.qh>
  #include <common/gamemodes/gamemode/onslaught/_mod.qh>
+ #include <common/gamemodes/gamemode/survival/_mod.qh>