Moved story version B behind switch serverside
Fixed conflict in switches
Merge branch 'master' into story
Reduced latest article content to two paragraphs
Moved edition into StoryPage model
Removed old contentType route
Merge pull request #530 from guardian/story

Moved story page v.B behind server-side switch