Merge remote branch 'origin/master' into fruitiex/freezetag_mapinfo

Conflicts:
	maps/g-23.mapinfo

diff --cc maps/g-23.mapinfo
index 1c994823e4f4159851d307e9e20f6501961e317f,594d03656f62f735364108a1242ebe4af7abb107..72ba59afe01ff81ca76521a2666ac2263638d609
--- 1/maps/g-23.mapinfo
--- 2/maps/g-23.mapinfo
+++ b/maps/g-23.mapinfo
@@@ -6,5 -6,4 +6,5 @@@ gametype d
  gametype lms
  gametype arena
  gametype rune
- cdtrack 6
 +gametype freezetag
+ cdtrack 2

diff --cc maps/red-planet.mapinfo
Simple merge