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

Conflicts:
	DroidShop/res/values/strings.xml
asagg
Merge branch 'master' of https://github.com/adeelateeque/DroidShop

Conflicts:
	DroidShop/project.properties
	DroidShop/src/main/java/com/droidshop/api/ProductApi.java
123
aeaea
Preparing for submission
123123
4rg