更新了百度地图
Merge branch 'master' of http://github.com/dustookk/find-me.git

Conflicts:
	AndroidManifest.xml
	src/com/gdg/findme/MainActivity.java
Merge remote-tracking branch 'origin/master'