make a little change on listactivity
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/com/mobile/smartshop/ListActivity.java
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
add welcome
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop