update beach waves, trimmed some pixels on beach hills
Merge branch 'master' of https://github.com/ebbyw/ZooRush-beta

Conflicts:
	Assets/Scenes/Levels/Level6-Beach.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems