Enviroment collision
Merging.Physics update.

Conflicts:
	core/src/com/xtrordinary/phantomspace/PhantomSpace.java