upd to videojs
Merge branch 'master' of https://github.com/tbsupport/tbsupport.github.io

Conflicts:
	js/app.js
	js/templates.js