Debuug
Merge branch 'master' of https://github.com/debflav/mars

Conflicts:
	MapGenerator/Map.php