--added shopping cart
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	src/main/AndroidManifest.xml
	src/main/java/com/mobile/smartshop/ShopActivity.java
	src/main/res/values/strings.xml