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

Conflicts:
	common/app/assets/stylesheets/module/containers/_picks.scss