Changes to go in line with updates to main repository
Merge branch 'master' of https://github.com/BristolCityCouncil/web_styles

Conflicts:
	package.json
	templates/email-templates/change_of_email.liquid
	templates/email-templates/email_activation.liquid
	templates/email-templates/forgot_password.liquid
	templates/email-templates/index.liquid
	templates/email-templates/order_new_bin.liquid
	templates/email-templates/password_reset.liquid
	templates/email-templates/welcome_email.liquid
	templates/sect-account/intro.liquid
	ui/fonts/icomoon/bcc.svg
	ui/js/app.js