Created ShipyardController, edited UpgradeBar so that ships can be sold.
Merge master into alex/dev

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/PlanetController.java