Merge branch 'master' into Lyberta/Survival

diff --cc maps/drain.mapinfo
index da7217eb8af9ff8cc9f4a2d224b4a9400b95ba34,50a96fa869ef16b503d945c5058400773e5c158a..fed171449ea817957a5020ba649e14f56f218741
--- 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 surv
++hidden

diff --cc maps/oilrig.mapinfo
index 4f5c8097706a40efd4fe122043d1a76d75c7b05c,47a54e8c0e408556533e965024747996622c00a5..5f12df7b6ba42e42b97e02835a59d254feb7b70b
--- 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 surv
+ 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