A few water script optimizations
Merge branch 'master' of github.com:mjw323/LostCloudSource

Conflicts:
	Assets/Scenes/TestLevels/Island.unity
	Library/AssetServerCacheV3
	Library/InspectorExpandedItems.asset
	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/guidmapper
Updates to water wake trail code(Currently disabled)
Merge branch 'master' of github.com:mjw323/LostCloudSource

Conflicts:
	Library/assetDatabase3
	Library/guidmapper
Terrain shader height-based gradient updates