Fixed sync change
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceCraft/SpaceCraft 1.0/bin/Ships/GatherShip.class