加入百度地图，发布活动。
Merge branch 'master' of https://github.com/ITBox/GaoRenZhiLu

Conflicts:
	code/GaoRenZhiLu/AndroidManifest.xml