edited
Merge branch 'master' of https://github.com/adeelateeque/DroidShop

Conflicts:
	DroidShop-prototype/src/com/droidshop/LoginActivity.java