Merge branch 'master' of github.com:guardian/frontend
Merge branch 'master' of github.com:guardian/frontend
cap layout to a maximum width of 940px
Video body stays in the same single column as Articles
Front trailblocks will now (try) use lead content if there are no editiors picks
Footer and content widths are capped
Section server will now accept editionionalised urls

e.g. /commentisfree/uk-edition
Merge branch 'master' of github.com:guardian/frontend into dotcom

Conflicts:
	dev-build/conf/routes
What was I thinking, that test would die 2 days from now
Max age for lead content is now 2 days
Merge pull request #1024 from guardian/comment-counts

Comment counts
escaping quotes is \" (not \\")
Refine image floating behaviour in articles
forgot to give defaults
Merge pull request #1025 from guardian/json-escape-quote-fix

Json escape quote fix
Merge pull request #1023 from guardian/dotcom

Lead Content in Front queries & editionalised sections
Missed a test file
Merge pull request #1020 from guardian/cap-header-width

Cap content, header and footer widths on larger screens
Align comment count with timestamp in trails
Merge pull request #1029 from guardian/align-comment-count-with-timestamp

Align comment count with timestamp in trails