Merge branch 'feature/edit_product_deatils' into develop
Merge branch 'develop' of github.com:wjp2013/SmartShop into develop

* 'develop' of github.com:wjp2013/SmartShop: