Fixes #79
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop

Conflicts:
	src/GameManager.cpp
	src/physic/ContactListener.cpp
	src/power/Sneeze.cpp