temporal glsl trial in webgl_test.html
Merge remote-tracking branch 'origin/master' into gh-pages