fixes #91
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop

Conflicts:
	assets/map/level1.xml