mac pro
Merge branch 'master' of https://github.com/helloworld116/BaiduMapTest

Conflicts:
	BaiduMapTest/ViewController.mm