Fix for build already in master
Merge branch 'v1.1' of https://github.com/di2e/openstorefront

Conflicts:
	client/openstorefront/bower.json
Merge branch 'v1.1' of https://github.com/di2e/openstorefront
Merge pull request #461 from dshurt/master

V1.1 Release
Merge pull request #462 from di2e/master

Master