Applying fix for video playback
Merge branch 'master' of github.com:Hipo/scribe-web

Conflicts:
	build/scribe/js/main.js
Merge branch 'master' of github.com:Hipo/scribe-web