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

Conflicts:
	maps/g-23.mapinfo

diff --combined 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 --combined maps/red-planet.mapinfo
index f414a6de562a6de7371d4c021515d804066496aa,6fd9740f37d700ed83732ac66a6eeee24f523dbc..74b9ede65a36f65407b081cde1d7c2ea740e45b9
--- 1/maps/red-planet.mapinfo
--- 2/maps/red-planet.mapinfo
+++ b/maps/red-planet.mapinfo
@@@ -1,7 -1,7 +1,7 @@@
  title Red Planet
  description A large facility on a red dusty planet
  author Mircea Kitsune, Cuinnton, FruitieX
- cdtrack 1
+ cdtrack 7
  has weapons
  gametype dm
  gametype tdm
@@@ -11,4 -11,3 +11,4 @@@ gametype aren
  gametype ca
  gametype dom
  gametype kh
 +gametype freezetag