Edited ShoppingCart.java, ShoppingListView.java, ShoppingTab.java
Merge branch 'master' of https://github.com/adeelateeque/DroidShop

Conflicts:
	DroidShop-api/pom.xml