Add preview checks to troubleshooter
Merge branch 'master' into preview-troubleshooter

Conflicts:
	common/app/conf/application.scala
Merge branch 'master' into preview-troubleshooter
Updated pasteup-buttons to patch 16
Football show more button refactoring
Removing unnecessary styles. Introducing relative line height
Merge pull request #7566 from guardian/show-more-button-ultimate-fix

Show more button final ultimate fix
test page improvements
js validation fix
minor bug
Adding back margin for less button
Merge pull request #7572 from guardian/show-more-margin

Adding back margin for less button
new creative for fo logos
Remove two links that are now confusing

And fix a styling issue
Hide elements overlaid on video player when using flash tech
Set correct web url and publication date for dream snaps
cr fix
Merge pull request #7577 from guardian/fix-dream-snaps-for-rss

Set correct web url and publication date for Dream Snaps (fixing RSS)
Minor refactor of WeatherController
cr fix