login
Merge branch 'master' of https://github.com/shaimaa-hshalaby/MobShopParse

Conflicts:
	bin/classes.dex
	bin/classes/com/commerce/mobshopparse/AddUserActivity.class
	bin/classes/com/commerce/mobshopparse/R$layout.class
	bin/classes/com/commerce/mobshopparse/R$menu.class
	bin/classes/com/commerce/mobshopparse/R$string.class
	bin/classes/com/commerce/mobshopparse/R$style.class
	bin/classes/com/commerce/mobshopparse/StoreAdminHome.class
	bin/classes/com/commerce/mobshopparse/StoreRegistrationActivity.class
	bin/classes/com/commerce/mobshopparse/util/ParseService$1.class
	bin/classes/com/commerce/mobshopparse/util/ParseService$2.class
	bin/classes/com/commerce/mobshopparse/util/ParseService$3.class
	bin/classes/com/commerce/mobshopparse/util/ParseService.class
	bin/resources.ap_
	gen/com/commerce/mobshopparse/R.java