Added support for video navigation
Merge branch 'master' into gh-pages