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

Conflicts:
	src/main/java/com/mobile/smartshop/ShopActivity.java
changes iml file to consensu
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/com/mobile/smartshop/MainActivity.java
	src/main/res/layout/activity_main.xml
Merge remote-tracking branch 'origin/develop' into develop
integrating list view in shopActiivity
added resource files for new implementation
deleted MainActivity.xml to resolve conflict"