email (not working yet)
smartshop.iml
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	src/main/java/com/mobile/smartshop/ShopActivity.java