changes for Shop
Merge branch 'master' of github.com:daoleen/other