A:baidu location SDK.
Merge branch 'master' of https://github.com/littlerhub/android.git

Conflicts:
	BianmiApp/src/com/link/bianmi/SysConfig.java