add mp4 and webm player support
Merge branch 'master' of https://github.com/jamiri/protorails
before merge with origin
Merge branch 'master' of https://github.com/jamiri/protorails
Merge branch 'master' of https://github.com/jamiri/protorails
update erd
add glossary tooltip on the lesson