Changed Model
Merge branch 'master' of https://github.com/artiespeedy/Solar-Centrifuge

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Library/assetDatabase3
	Library/guidmapper
Merge branch 'master' of https://github.com/artiespeedy/Solar-Centrifuge

Conflicts:
	Assets/Models/Space Ship/Ship_prefab.prefab
	Library/AssetServerCacheV3
	Library/assetDatabase3