Merge branch 'sydni-new' Final M8

Conflicts:
	SpaceTrader/data.bin