Merge Main/master

Conflicts:
	client/openstorefront/app/scripts/app.js
	client/openstorefront/app/scripts/controllers/results.js
Merge pull request #56 from dshurt/master

Merge Main/master