Merge branch 'master' of github.com:guardian/frontend into switch-me-on

Conflicts:
	common/app/conf/switches.scala