Added functionality for back button in MarketPlaceController
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders

Conflicts:
	src/com/teamoxygen/spacetraders/view/MarketplaceController.java
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders