fixing js error with videos on fronts
Merge branch 'master' of github.com:guardian/frontend into front-video-jserror

* 'master' of github.com:guardian/frontend: (96 commits)
  indentation
  fixing football match page style
  renaming css class
  change gallery/images to ul/li
  scsslinting error
  The horror ... the horror ...
  scss formatting
  gallery schema.org markup
  cap captions and unremify
  gallery social button margin
  fixing gallery tests
  move loading of dfp after tags
  fixing gallery row numbers
  removing old css
  removing empty css
  min-height for gallery images
  more gallery2 styling
  you doughnut
  use attr when adding classes
  Allow standard articles to be upgraded to a video player if main media is video
  ...

Conflicts:
	common/app/assets/javascripts/bootstraps/media.js
Merge pull request #5667 from guardian/front-video-jserror

fixing js error with videos on fronts