Minor water changes(messing with hover waves)
Merge branch 'master' of github.com:mjw323/LostCloudSource

Conflicts:
	Assets/Materials/terrain_lakeWater.mat
	Assets/Scenes/TestLevels/Island.unity
	Library/AssetServerCacheV3
	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/assetDatabase3
	Library/guidmapper
Hoverboard water waves WIP