Merge branch 'release/3_2_7' into develop
doc
doc
added jasmine task and a spec file
added tasks specs
Merge branch 'develop' of github.com:koemei/koemei-widget into develop
added videojsplayer.coffee
Added videojsplayer; video.min.js
Begins videojs widget implementation
merge conflict resolve; accepted tuhinc's changes; added .idea/ to gitignore
prettified jwplayer; added some notes to videojsplayer.coffee
added videojs to gruntfile
videojs is now recognized; removed 'debug false' statement
Resolves merge
Resolves merge

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

Conflicts:
	src/koemei/coffee/player_interfaces/videojsplayer.coffee
added @media_item to constructor; calling @player.controls
[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
resolves merge
render function no longer defined twice