Merge branch 'gh-pages' into dev
video back fixed
Merge branch 'dev' into gh-pages