finishing up shipyard stuff - Hutchinson
resolved universe controller -Hutchinson
Merge origin/M7 into M7

Conflicts:
	SpaceTrader/src/spacetrader/UniverseController.java