14.07
Merge remote-tracking branch 'origin/Dennis' into Dennis

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Level/Progress/CS_Game_Phase1V1.unity
	Assets/Level/Progress/CS_Game_Phase2V1.unity
	Assets/Level/Progress/CS_Game_Phase3V1.unity
	CyberSphere.userprefs
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/92/92e49db5c4da5534993529c1567937d6
	Library/metadata/99/999ffe0b086cfe149b298498c4daf623
Merge branch 'Dennis' of https://github.com/School4Games/CyberSphere into Dennis