corrected ocean2 shader demo html file
Merge branch 'dev' of https://github.com/AleksandrAlbert/three.js into dev
OrbitControls: Added stopPropagation as per afaff8207b42bf475acb383a171fbeec1e5b0a77. Fixes #4229.