Added inline videos to content api call
Fixed typo
Merge branch 'master' of github.com:guardian/frontend into inline-videos

Conflicts:
	article/app/controllers/ArticleController.scala
	common/app/assets/stylesheets/module/_article.less
Fixed merge conflicts
Added omniture video tracking
Working omniture video tracking
Fixed merge conflicts
Merge branch 'master' into inline-videos
Added blockAds and source to Video model
Added provider and restricted content meta data to omniture calls
Load media module earlier. Track volume change. Debounce event tracker call.
Fix merge conflict
Added omniture s object to jshint global config
Merge pull request #561 from guardian/inline-videos

Video tracking with omniture