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

Conflicts:
	DroidShop/AndroidManifest.xml
Merge branch 'master' of https://github.com/adeelateeque/DroidShop
updated
Merge branch 'master' of https://github.com/adeelateeque/DroidShop

Conflicts:
	DroidShop/src/main/java/com/droidshop/api/ProductApi.java
	DroidShop/src/main/java/com/droidshop/ui/product/ProductDescriptionFragment.java
	DroidShop/src/main/java/com/droidshop/ui/product/ProductListFragment.java
a
c
Some error
Merge branch 'master' of https://github.com/adeelateeque/DroidShop