fixing check for shipyard
Merge origin/M9 into M9
fixing check in ShipYard
Merge origin/M9 into M9

Conflicts:
	SpaceTrader/src/spacetrader/ShipYard.java