Fixed collision issue and added skybox (2)
Merge branch 'master' of https://github.com/kalby/SpaceCOG-Prototype

Conflicts:
	Assets/Scripts/SpaceshipFlight.cs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/8b/8bf6d66dce89f514b97a62bba2c0f432
	Library/metadata/e6/e6d798376ab7a0d4f917159321b5a909
	SpaceCOG-Prototype-csharp.v12.suo