Merge branch 'master' into cost-to-break-calculator

Conflicts:
	app/styles/_directives.scss