minor fixes
minor bug fixes
Merge branch 'locak'

Conflicts:
	SpaceGame.sdf