Resolves merge
Resolves merge

Merge branch 'videojs' of https://github.com/koemei/koemei-widget into videojs

Conflicts:
	src/koemei/coffee/player_interfaces/videojsplayer.coffee
[broken] Attempts to integrate videojs with backbone
Resolves merge

Merge branch 'videojs' of https://github.com/koemei/koemei-widget into videojs

Conflicts:
	src/koemei/coffee/player_interfaces/videojsplayer.coffee