Redirect pages that are on the wrong url (according to the content api)
Merge branch 'master' of github.com:guardian/frontend into item-redirects

Conflicts:
	common/app/conf/switches.scala
Merge branch 'master' of github.com:guardian/frontend into item-redirects
Item redirects support short urls
Item redirects support short urls
Merge branch 'master' of github.com:guardian/frontend into item-redirects
Oops, some merge issues there
Cleaned up ModelOrResult a bit
Merge branch 'master' of github.com:guardian/frontend into item-redirects

Conflicts:
	common/app/conf/switches.scala
Added test data file
Merge pull request #2153 from guardian/item-redirects

Item redirects