Merge branch 'master' into Lyberta/GunGame

diff --cc maps/drain.mapinfo
index 3d9d6246a89a406c1e341129331c082a215f49fd,50a96fa869ef16b503d945c5058400773e5c158a..79ed59154fae6279711457f92af74c924a3eed79
--- 1/maps/drain.mapinfo
--- 2/maps/drain.mapinfo
+++ b/maps/drain.mapinfo
@@@ -10,4 -10,4 +10,5 @@@ gametype k
  gametype ft
  gametype ka
  gametype tdm
 -hidden
 +gametype gg
++hidden

diff --cc maps/oilrig.mapinfo
index 9498285cd2f374d7af0e39ca6d68b2c78e168baf,47a54e8c0e408556533e965024747996622c00a5..34b0463f046cf5c64bf00c011d52f150aab42f2f
--- 1/maps/oilrig.mapinfo
--- 2/maps/oilrig.mapinfo
+++ b/maps/oilrig.mapinfo
@@@ -10,6 -10,6 +10,7 @@@ gametype c
  gametype kh
  gametype ft
  gametype ka
 +gametype gg
+ hidden
  
 -clientsettemp_for_type all r_shadow_realtime_world 0 // Disabled, because the performance drops significantly
 +clientsettemp_for_type all r_shadow_realtime_world 0 // Disabled, because the performance drops significantly