Small water shader changes
Merge branch 'master' of https://github.com/ByteSheep/UnityTestProject

Conflicts:
	Assets/Displacement/Materials/WaterCustomColors.mat
	Assets/Displacement/Shaders/WaterCustomLighting.shader
Fix merge