Merge Main/master

Conflicts:
	client/openstorefront/app/scripts/app.js
	client/openstorefront/app/scripts/controllers/results.js