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

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of https://github.com/dustookk/find-me.git
处理冲突
Merge branch 'master' of https://github.com/dustookk/find-me.git

Conflicts:
	bin/FindMe.apk
	bin/classes.dex
	bin/dexedLibs/android-support-v4-adbd72dfe21551071310d32e7c0350d9.jar
	bin/dexedLibs/baidumapapi_v2_0_0-a6d5b9d3de5d0ff1e0bcac4a43ee1161.jar
	bin/dexedLibs/commons-lang3-3.0-beta-1ee597c2ab14da8a0cbbc9de50213061.jar
	bin/dexedLibs/fastjson-1.1.26-b3eb605974c50e7bccb6eb1204312c23.jar
	bin/dexedLibs/locSDK_3.3-3e86d2c73e68de3c560fce6f726db907.jar
	bin/resources.ap_