Minor Changes
Merge branch 'master' of github.com:mjw323/LostCloudSource

Conflicts:
	Assets/Scenes/TestLevels/Island.unity
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	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-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
Minor changes
Merge branch 'master' of github.com:mjw323/LostCloudSource

Conflicts:
	Assets/Materials/island/terrain_W4A1_water.mat
	Assets/Materials/island/terrain_W4A2_water.mat
	Assets/Materials/island/terrain_W4A4_water.mat
	Assets/Materials/island/terrain_W4A5_water.mat
	Assets/Materials/island/terrain_lakeWater.mat
	Assets/Shaders/ReplaceShader2.shader
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
Fixes for broken project. Now runs again.