Added 'link rel=canonical' to all pages
Merge branch 'master' of github.com:guardian/frontend into canonical

Conflicts:
	article/test/ArticleFeatureTest.scala
Merge pull request #4287 from guardian/canonical

Added 'link rel=canonical' to all pages