updates water
Merge branch 'master' of https://github.com/guillaume-gouchon/island

Conflicts:
	app/scripts/main.js