done with shopping list/cart/checkout ui
Merge branch 'master' of https://github.com/adeelateeque/DroidShop

Conflicts:
	DroidShop-prototype/src/com/droidshop/LoginActivity.java
	DroidShop/libs/android-support-v4.jar