Added Keys to JSON goods. Added Buybar with Ship goods.
Merge branch 'master' into sam/dev

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/MarketController.java
Got Selling Goods Panel to appear.
Merge branch 'sam/dev'

Conflicts:
	src/main/java/edu/gatech/gem5/game/Planet.java
	src/main/java/edu/gatech/gem5/game/controllers/MarketController.java
Fixed Nullpointer bugs in MarketController.
Merge branch 'master' of https://github.com/gem-5/last-adventures

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/MarketController.java
	src/main/resources/market.fxml
Fixed some errors. Added some changes to the DisplayUniverse controller.
Merge branch 'master' of https://github.com/gem-5/last-adventures
Properly merged.
Merged the change of Ship.getCargoCount from Good to GoodType
fixed double import of util.Map