Merge branch 'Lyberta/GunGame' into Lyberta/master

diff --cc maps/drain.mapinfo
index 1d211d553f79799a6c529865bef4758a24e88851,79ed59154fae6279711457f92af74c924a3eed79..006857c519e0e9488472c0b48e1bb3eb6bde01ef
--- 1/maps/drain.mapinfo
--- 2/maps/drain.mapinfo
+++ b/maps/drain.mapinfo
@@@ -11,4 -11,4 +11,5 @@@ gametype f
  gametype ka
  gametype tdm
  gametype gg
 +gametype surv
+ hidden

diff --cc maps/oilrig.mapinfo
index 1a8aa99d28bf767a3b72af13c75faa4c51875762,34b0463f046cf5c64bf00c011d52f150aab42f2f..a209df58076a7d66f58ce32083478f4baf1a4036
--- 1/maps/oilrig.mapinfo
--- 2/maps/oilrig.mapinfo
+++ b/maps/oilrig.mapinfo
@@@ -11,6 -11,6 +11,7 @@@ gametype k
  gametype ft
  gametype ka
  gametype gg
 +gametype surv
+ hidden
  
  clientsettemp_for_type all r_shadow_realtime_world 0 // Disabled, because the performance drops significantly