Add collisions
Merge branch 'master' of https://github.com/black-duck/sos

Conflicts:
	scripts/core/GameEngine.js