Merge branch 'master' of github.com:guardian/frontend
Merge branch 'master' of github.com:guardian/frontend
Merge branch 'master' of github.com:guardian/frontend
Merge branch 'master' of github.com:guardian/frontend
Merge branch 'master' of github.com:guardian/frontend
Merge branch 'master' of github.com:guardian/frontend into breakpoints-articles
Figure in article has a CSS identifier
Figure in article gets a class when comments are on
Article scales well above tablet size
Merge branch 'master' of github.com:guardian/frontend into breakpoints-articles
turned short discussion switch on by default
re-ordering routes
Merge pull request #1016 from guardian/json-format-route-fix

Re-ordering routes
Merge branch 'master' of github.com:guardian/frontend into breakpoints-articles
Merge pull request #1015 from gidsg/discussion-switch

turned short discussion switch on by default
Merge branch 'master' of github.com:guardian/frontend into breakpoints-articles
allow participating in the same test more than once
Merge pull request #1017 from guardian/ab-test-participation

Allow participating in the same AB test more than once
Test that the toggle class is applied to the article's primary image
Merge branch 'master' of github.com:guardian/frontend into breakpoints-articles