Added collision filtering and handling
Merge branch 'master' of https://github.com/spfrommer/phagex

Conflicts:
	src/engine/core/Scene.java