Simplify CSS setup, everything is in global.min.css, loaded through a link in the head
Removed rel=canonical tags from theguardian.com domain.

Editionalised pages now get...

<link rel="alternate" hreflang="..." href="..." />
Merge branch 'master' of github.com:guardian/frontend into dotcom
Removed rel=canonical tags from theguardian.com domain.

Editionalised pages now get...

<link rel="alternate" hreflang="..." href="..." />
Merge branch 'master' of github.com:guardian/frontend into css-head

Conflicts:
	common/app/assets/stylesheets/global.scss
Merge branch 'master' of github.com:guardian/frontend into css-head
Merge branch 'master' of github.com:guardian/frontend into css-head
Merge branch 'master' of github.com:guardian/frontend into dotcom
don't use user prefs, store manually
Merge pull request #1069 from guardian/css-head

Simplify CSS setup, everything is in global.min.css, loaded through a link in the head
Stop edition urls leaking into m.guardian.co.uk
Merge pull request #1081 from guardian/dotcom

Editionalised pages meta data
Remove lazyloaded CSS
Merge pull request #1086 from guardian/paras-user-zoom

Don't use user prefs, store manually
run in common bootstrap, not articl
Fixed missing feature trailblock
Revert "Remove lazyloaded CSS"

This reverts commit f8e6bbef6599f26e29b3e947588af7141ec0e262.
Merge pull request #1090 from guardian/paras-user-zoom

Moving into common bootstrap
Fixed missing feature trailblock
Merge branch 'master' of github.com:guardian/frontend