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

Conflicts:
	DroidShop/project.properties
Merge branch 'master' of https://github.com/adeelateeque/DroidShop

Conflicts:
	DroidShop/project.properties
Update