test
Merge branch 'master' of https://github.com/CityGenerator/Megacosm-Generator into develop

Conflicts:
	wsgi/megacosm.py