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

Conflicts:
	DroidShop/src/main/java/com/droidshop/ui/product/ProductListFragment.java