Inventory: fixed the bug
Merge origin/M7 into M7
Added cheats to Marketplace
thiiiings - hutchinson
Merge origin/M7 into M7
font fixes and refuel dialog
Ship- capacity is implemented
Character- when ship is set, the character's inventory gets changed. 
Ships- modified constructor
Added to shipyardstyle.css, editing for adding things Afiq needs - Hutchinson
Merge origin/M7 into M7

Conflicts:
	SpaceTrader/src/spacetrader/Universe.fxml
	SpaceTrader/src/spacetrader/resources/shipyardstyle.css
comitting universeController - hutch
ShipYard- enforces MLP now
spacing issues, css update, added capacity to ship class -Hutchinson
capacity label in market added
fixed checkstyle for universe controller