Merge branch 'master' of github.com:guardian/frontend into bacon

Conflicts:
	common/app/assets/images/global/sprite.png
	common/app/assets/stylesheets/module/facia/_items.scss
	common/app/assets/stylesheets/theme/_global-icons-sprite.scss
	common/app/assets/stylesheets/theme/_global-icons-svg.scss