Massive update to Market and game flow

Market has been updated to version 2.0
Selling incoming in a little bit.
Buying is fully functional and prints a list of current cargo to the
console.
Displays appropriate error messages.

Fixed Universe creation in order to support travel to multiple locations
- it is now created after clicking "Done" on the character creation
screen.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Space Trader/nbproject/private/private.xml
	Space Trader/src/space/trader/MarketScreen.fxml
	Space Trader/src/space/trader/MarketScreenController.java
	Space Trader/src/space/trader/Ship.java
	Space Trader/src/space/trader/UniverseScreenController.java