Merge origin/M9 into Olivia

Conflicts:
	SpaceTrader/src/spacetrader/Universe.fxml
	SpaceTrader/src/spacetrader/UniverseController.java
	SpaceTrader/src/spacetrader/resources/Thumbs.db
	SpaceTrader/src/spacetrader/resources/shipyardstyle.css
random pictures for planets and ss