Remove Lifeandstyle Hack
Merge branch 'master' into kc-lifestyle-fix

Conflicts:
	common/app/conf/switches.scala
Merge pull request #4191 from guardian/kc-lifestyle-fix

Remove Lifeandstyle Hack