Merge branch 'master' of github.com:guardian/frontend into article-breakpoints-tweaks

Conflicts:
	article/app/views/fragments/articleBody.scala.html
	common/app/assets/stylesheets/module/_adslot.scss
Merge pull request #1043 from guardian/article-breakpoints-tweaks

Article breakpoints tweaks
Merge pull request #1042 from guardian/most-read-profile-page

Fix 'most read' on profile pages
"Show more" button text is vertically centered

Also using 2 space indentation
Expander text look well centered in iOS. Also, now using a real minus sign.
Simplify media queries, stop relying on media type
Merge pull request #1048 from guardian/simplify-media-queries

Simplify media queries, stop relying on media type
Merge branch 'master' of github.com:guardian/frontend into expander-vertical-centering

Conflicts:
	common/app/assets/stylesheets/state/_state.scss
Add switch groups.
Merge pull request #1049 from guardian/switches

Add switch groups.
CSS Cleanup
try changing the expander page to see if that fixes integration test issue
Firefox breaks words when appropriate only
This can be called just Content with a import rename.
Merge pull request #1050 from guardian/css-cleanup

CSS Cleanup
Comments look better in live blogs
Text is verically centered in ctas
Merge pull request #1051 from guardian/inline-discussion-tweaks

Inline discussion tweaks
Merge branch 'master' of https://github.com/guardian/frontend into change-article-with-expander
Optimize text rendering for headings