Merged Lyberta/PlayerTemplates into Lyberta/Survival.

diff --cc gamemodes-server.cfg
index 6871c271ae08ffbcfe115cc02dd39a7a16335f97,6790a3b4fb9575ab91e070c57bc984ac97609ba2..004d1485d3485a93535778f6c03043cc13fc50c1
--- 1/gamemodes-server.cfg
--- 2/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@@ -521,5 -521,4 +521,6 @@@ set g_invasion_spawn_delay 0.2
  set g_invasion_spawnpoint_spawn_delay 0.5
  set g_invasion_teams 0 "number of teams in invasion (note: use mapinfo to set this)"
  set g_invasion_team_spawns 1 "use team spawns in teamplay invasion mode"
+ set g_invasion_type 0 "type of invasion mode - 0: round-based, 1: hunting, 2: complete the stage (note: use mapinfo to set this)"
 +
 +exec survival.cfg // Lyberta: surv

diff --cc qcsrc/common/mapinfo.qh
Simple merge

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

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