Merge branch 'develop' of https://github.com/mbuettner/webgl-ripples into develop