Collision testing update

update collision with testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceCraft/SpaceCraft 1.0/bin/Frame/Space.class