don't use user prefs, store manually
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
Revert "Simplify CSS setup, everything is in global.min.css, loaded through a link in the head"

This reverts commit 09e670e8565ae934ab9bc1f4d49f1a5e52c28f3a.

Conflicts:

	common/app/assets/stylesheets/global.scss
Merge branch 'master' of github.com:guardian/frontend
Remove original global.scss file
Fixed missing feature trailblock
Merge branch 'master' of github.com:guardian/frontend
Merge branch 'master' into local-nav

Conflicts:
	common/app/assets/stylesheets/global.scss