Add solar system / planet minimum spacing
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/Planet.java