Expander text look well centered in iOS. Also, now using a real minus sign.
Merge branch 'master' of github.com:guardian/frontend into expander-vertical-centering

Conflicts:
	common/app/assets/stylesheets/state/_state.scss
try changing the expander page to see if that fixes integration test issue
Merge branch 'master' of https://github.com/guardian/frontend into change-article-with-expander
Variant 1: Remove spacing from paragraphs, add indents
Configure paragraph spacing experiment
Added s-maxage, remove public

i. Our CDNs will use 's-maxage' to cache the resources.

ii. The clients will use the 'max-age' value.

iii. When we switch to Varnish (on a single domain) we either need to remove 's-maxage' on outbound requests or add the 'private' declaration.

In this regard I thinking the 'public' declaration is spurious.
Fix test names so they are catched by the framework
Merge branch 'master' of github.com:guardian/frontend into expander-vertical-centering

Conflicts:
	common/app/assets/stylesheets/module/_cta.scss
	common/app/assets/stylesheets/state/_state.scss
Set up typography rules and restrict test to 10% of audience
Revert "Use a non-snapshot version of Salat."

This reverts commit 4a0888dd17077c9cc9066a5a9e92ca51628664e1.
Merge pull request #1065 from guardian/smaxage

Added s-maxage, remove public
Removed duplicate tests (cache-control is tested adequately in common)
Merge branch 'master' of https://github.com/guardian/frontend
Remove extraneous type attribute on analytics script tag
Tell older blackberries this is a mobile site
Website is pinnable in Windows 8
InBodyLink now understands editions
Merge branch 'master' of github.com:guardian/frontend into ab-test-paragraph-spacing

Conflicts:
	common/app/assets/stylesheets/module/experiments/_article-breakpoints.scss
Merge pull request #1070 from guardian/old-blackberry-fix

Tell older blackberries this is a mobile optimised site