Minor changes, testing grass.
Merge branch 'master' of github.com:mjw323/LostCloudSource

Conflicts:
	Library/CurrentLayout.dwlt
	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/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
Merge branch 'master' of github.com:mjw323/LostCloudSource

Conflicts:
	Assets/Scripts/Game/Environment/Grass.cs
	Assets/Scripts/Game/Environment/Grass.cs.meta
	Assets/Shaders/Grass.shader
	Assets/Shaders/Grass.shader.meta
	Library/CurrentMaximizeLayout.dwlt
Minor changes
Merge branch 'master' of github.com:mjw323/LostCloudSource

Conflicts:
	Library/assetDatabase3
	Library/guidmapper
Merge branch 'master' of github.com:mjw323/LostCloudSource

Conflicts:
	Library/CurrentLayout.dwlt
	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/expandedItems
Merge branch 'master' of github.com:mjw323/LostCloudSource

Conflicts:
	Assets/Materials/island/terrain_lakeWater.mat
	Library/AnnotationManager
	Library/BuildSettings.asset
	Library/CurrentMaximizeLayout.dwlt
	Library/EditorUserSettings.asset
	Library/MonoManager.asset
	Library/ProjectSettings.asset
	ProjectSettings/QualitySettings.asset
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
Small fix in DynamicCamera.cs to resolve build errors
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
	Library/CurrentLayout.dwlt
	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/expandedItems
	Library/guidmapper