Collision events
Merge branch 'develop' of https://github.com/ggj/ggj13 into develop

Conflicts:
	source/game/physicsmanager.cpp