完成基本流程
Merge branch 'master' of https://github.com/dustookk/find-me.git

Conflicts:
	bin/FindMe.apk
	bin/classes.dex
	bin/classes/com/gdg/findme/receiver/LocationHandleReceiver.class
	bin/classes/com/gdg/findme/service/SendTextService.class
	bin/resources.ap_
	src/com/gdg/findme/receiver/LocationHandleReceiver.java
	src/com/gdg/findme/service/SendTextService.java