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
Footer and content widths are capped
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
Revert "Align comment count with timestamp in trails"

This reverts commit bc7e83dbbccfbbf5fa37223eaf47d2ca445e9060.
Cap content width only in article
Bylines don't bleed out of the flow on tablets
Merge pull request #1030 from guardian/cap-width-only-in-articles

Cap content width only in article pages
Merge branch 'master' into swipe-sequence
Add jasmine test