Fix failing test by forcing switch on before it's run
Merge branch 'master' of github.com:guardian/frontend into play-release

Conflicts:
	article/test/ArticleFeatureTest.scala