Updated Controller for marketplace view
Merge origin/master
Updated Controller for marketplace view
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/view/SolarSystemViewController.java
Updated Marketplace view controller
Merge origin/master
Updated Marketplace view controller