Remove Lifeandstyle Hack
Short names on wallchart
Merge pull request #4221 from guardian/football-names

Short names on wallchart
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
Merge branch 'master' of github.com:guardian/frontend into tag-cloud
Fixes based on Pull Request.