Merged Lyberta/GunGame into Lyberta/master.

diff --cc gamemodes-server.cfg
index 1991f0c76f6d5d93cc52007e0fe2fd37feb677f9,dafe7759e466cceb7ddcc4de3de184bf779e2543..c11ecacbf0673f7fe1e57216ee66b3b0c3391a1b
--- 1/gamemodes-server.cfg
--- 2/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@@ -536,5 -537,4 +536,6 @@@ set g_invasion_type 0 "type of invasio
  // =========
  set g_gg 0 "GunGame: Kill players with all weapons"
  set g_gg_weapons "vortex mortar machinegun hagar arc electro devastator crylink shotgun blaster"
+ set g_gg_kills_per_weapon 3 "Number of kills needed to advance to the next weapon"
 +
 +exec survival.cfg // Lyberta: surv