Ship types, power ups and format cleaning
Merge remote-tracking branch 'origin/Willies_branch' into Willies_branch

Conflicts:
	SpaceCOG Client/Assets/Scripts/ServerGameScript.cs