Fixed some null ptr exceptions and added more fuel

Players now have 50 fuel by default, and going back from the planet to
the universe correctly updates information labels
Merge remote-tracking branch 'origin/master'

Conflicts:
	Space Trader/src/space/trader/MarketScreen.fxml
	Space Trader/src/space/trader/MarketScreenController.java