The horror ... the horror ...
Merge pull request #5695 from guardian/refactor-metadata

The horror ... the horror ...
fixing football match page style
indentation
Merge pull request #5699 from guardian/football-fix

fixing football match page style
Merge branch 'master' of github.com:guardian/frontend into video-suffixes

* 'master' of github.com:guardian/frontend:
  indentation
  fixing football match page style
  The horror ... the horror ...

Conflicts:
	common/app/model/content.scala