no message
Merge branch 'master' of https://github.com/dshurt/Open-Storefront
Merge branch 'master' of https://github.com/dshurt/Open-Storefront
Changes for User profile modals, etc.
Merge branch 'master' of https://github.com/dshurt/Open-Storefront

Conflicts:
	client/openstorefront/app/index.html
Merge pull request #67 from gebagley/master

Modals for User profile, feedback,