Merge branch 'master' of https://github.com/xuj/baidu_map.git
Merge branch 'master' of https://github.com/xuj/baidu_map.git