Got rid of 'SwitchingContentApi'
Merge branch 'master' of github.com:guardian/frontend into content-api

Conflicts:
	common/app/services/ParseCollection.scala
	common/test/common/GuardianConfigurationTest.scala
Merge branch 'master' of github.com:guardian/frontend into content-api

Conflicts:
	common/app/services/ParseCollection.scala
	common/test/common/GuardianConfigurationTest.scala
Merge branch 'master' of github.com:guardian/frontend into content-api

Conflicts:
	common/app/services/ParseCollection.scala
Extend gzip switch to end of May.

I want to see what effect it has on a month of bills.
Merge pull request #4028 from guardian/content-api

Got rid of 'SwitchingContentApi'