Merge branch 'develop'

* develop:
  Updated media component
Updated inview bug

Merge branch 'develop'

* develop:
  Updated inview
Updated media template to have ogg and not ogv
Merge pull request #23 from adaptlearning/hotfix/#21

Updated media template to have ogg and not ogv
Merge branch 'master' into develop

* master:
  Updated media template to have ogg and not ogv