Tests and cleans
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop

Conflicts:
	assets/data.xml
	src/GameManager.cpp
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop