Inherit Doc changes to SPacerWOrldsad
Merge branch 'master' of github.com:SpaceTeam/MicroSpace

Conflicts:
	MicroSpace/src/com/punchline/microspace/entities/SpaceWorld.java