Merge pull request #540 from dshurt/master

merge with 1.2 for 1.2 release
Merge branch 'master' of https://github.com/di2e/openstorefront into v1.3
Merge pull request #541 from dshurt/v1.3

V1.3