Merge remote-tracking branch 'origin/master' into samual/runningman_separate

Conflicts:
	maps/runningman.mapinfo

diff --combined maps/runningman.mapinfo
index cbc3768187be94c470949824a7ae30b73d718490,e415cd72c4a779295f0317c302dcb680c091b72c..df8b6355f48639cb3746f74a72852bcf942c439f
--- 1/maps/runningman.mapinfo
--- 2/maps/runningman.mapinfo
+++ b/maps/runningman.mapinfo
@@@ -1,10 -1,17 +1,11 @@@
  title Running Man
 -description Medium-sized, fast enclosed map supporting multiple gamemodes.
 +description Medium-sized, fast enclosed map.
  author Paul Evers, FruitieX
  cdtrack 6
  has weapons
  gametype dm
  gametype lms
 -gametype rune
 -gametype ctf
 -gametype ca
 -gametype kh
 -gametype ons
 -gametype dom
  gametype arena
- gametype keepaway
+ gametype ft
+ gametype ka
  clientsettemp_for_type all r_water 1