ukj,
Merge branch 'master' of https://github.com/dustookk/find-me.git

Conflicts:
	bin/FindMe.apk
	bin/classes.dex
	bin/resources.ap_