Refactoring collision handling
Merge branch 'master' into collisions

Conflicts:
	src/Game.cpp
Update Collisions