Merge pull request #266 from grbritz/master

Fixing bug on site when viewed with secure URL
video
Merge pull request #267 from mkmathur/master

video fix
fixed scroll issue on windows
update to upstream master