Updated controller and screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/teamoxygen/spacetraders/view/MarketplaceController.java
	src/com/teamoxygen/spacetraders/view/MarketplaceWindow.fxml