Bug fix
Merge branch 'master' of https://github.com/afrishal/sharloc

Conflicts:
	bin/Sharloc.apk
	bin/classes.dex
	bin/classes/com/sharlocstudio/sharloc/HomeFragment.class