Added to shipyardstyle.css, editing for adding things Afiq needs - Hutchinson
Merge origin/M7 into M7

Conflicts:
	SpaceTrader/src/spacetrader/Universe.fxml
	SpaceTrader/src/spacetrader/resources/shipyardstyle.css
comitting universeController - hutch