save current work
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	smartShop.iml
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop