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

Conflicts:
	DroidShop/project.properties
	DroidShop/src/main/java/com/droidshop/core/AvatarLoader.java
	DroidShop/src/main/java/com/droidshop/ui/CheckInsListFragment.java
Updated
Merge branch 'master' of https://github.com/adeelateeque/DroidShop