Link Ship to CargoBay
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceTrader/bin/spacetrader/Economy.class
	SpaceTrader/bin/spacetrader/Ship.class