formatting
Merge Main/master

Conflicts:
	client/openstorefront/app/scripts/app.js
Merge Main/master
Merge Main/master

Conflicts:
	client/openstorefront/app/scripts/app.js
Text fix
Merge pull request #70 from dshurt/master

Merge with minor changes