Updated Marketplace view controller
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/view/SolarSystemView.fxml
Updated Marketplace view
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/view/SolarSystemView.fxml
Updated Marketplace view
Updated Marketplace view