clean
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop
fix some levels
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop

Conflicts:
	assets/data.xml
	src/GameManager.cpp
	src/sound/SoundEntity.cpp