merge
Merge branch 'master' of https://github.com/edison7500/MobileCommerce
Merge branch 'master' of https://github.com/edison7500/MobileCommerce
updat