Changed ArrayList<Resources> to be type Resources, method rehaul
Fixed broken methods resulting from Cargo.java
Added updating inventory labels and moneylabel in marketplace
to do: move player configuration to top of hierarchy
Label cocaineUnitPrice commented out, causes a nullpointer (other 4 work fine)
gold unit price shows as negative integer
Merge branch 'feature/M5_Controllers' of https://github.com/astrosnails/SpaceTraders into feature/M5_Controllers

Conflicts:
	src/main/java/spacetraders/MainApplication.java
	src/main/java/spacetraders/MarketPlaceController.java
	src/main/java/spacetraders/model/Universe.java