Add preview checks to troubleshooter
Ensure video as main media contains canonical path for embed plugin
Merge branch 'master' into preview-troubleshooter

Conflicts:
	common/app/conf/application.scala
Merge branch 'master' into preview-troubleshooter
Monocle ... monocle ...
Fix styling for the fixtures and results container
Fix links
Pull in snaps for results and fixtures
Imports
specify charset on a per font basis
Add league table widget to football team page
Fix look up for most pertinent competition for table
Load in container asynchronously
Add ability to create containers with HTML blobs instead of content cards
Embed html directly into fronts
Merge branch 'master' of github.com:guardian/frontend into embeded-video

* 'master' of github.com:guardian/frontend: (285 commits)
  fix test, natch
  fix broken test by football table re-order
  js validate fixes
  re add international friendlies
  book inline added to the test page
  consistent html
  Don't escape query
  Cancel the video ad framework if vast doesn't provide an advert
  travel offers
  simplify masterclasses
  Video share button classes fix
  Unblock training fronts
  simplifying book/s
  Add extra cloudwatch metrics.
  consolidate jobs
  Intercept content 400 errors
  Rename FluidWidth to Fluid in Scalalalalaland
  Unique port and fix package name
  Make better method name; getCityIdFromCity
  Fix mixins
  ...
fix videoplayer call
Merge branch 'master' of github.com:guardian/frontend into embeded-video

* 'master' of github.com:guardian/frontend: (45 commits)
  Move Emergency Flush Button
  Improve tracking
  Refactor and Integrate New Agents
  tweaking largest editorial crop logic
  changing rich-link mobile styling
  Use text templates.
  Data link names. Use text template.
  Load Custom Values
  Load Custom Keys
  Abstract out Common Behaviour
  Keep meganav tabs on same level as page tags
  Tweak for mobile meganav
  Add New Route to Admin Menu
  Remove invocation from bootstrap
  JsHint
  Run as a zero AB test
  Add Route for New DfpDataController
  Create Controller to Handle DFP Cache Flushing
  Tidy
  Better switches
  ...
Separate Loading of Placements
be explicit with arguments