trying to pull
Merged Equipment Market changes with ShipYardScreen.
Shipyard Screen is completely reformatted. Fuel and Hull Strength bars work correctly. Buttons disappear if you have full  fuel and/or hull strength. Changed how the increase fuel and increase hull strength  buttons calculate their values.
Fixed bug where a random event that increases your hull strength would increase it past its max amount.
Merged Equipment Market changes with ShipYardScreen.
Shipyard Screen is completely reformatted. Fuel and Hull Strength bars work correctly. Buttons disappear if you have full  fuel and/or hull strength. Changed how the increase fuel and increase hull strength  buttons calculate their values.
Fixed bug where a random event that increases your hull strength would increase it past its max amount.
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.properties
	src/spacetrader/ships/GadgetType.java
	src/spacetrader/ships/ShipYardScreen.fxml
	src/spacetrader/system/ShipYardScreenController.java
	src/spacetrader/travel/ChangeHullEvent.java
Still merging ShipYardScreen changes