The water is now rendered with proper specular lighting.
Merge branch 'develop' into gh-pages