Fix weird planet selection anomaly
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/ShipyardController.java