本地测试
Merge branch 'master' of https://github.com/tiandiwo9/MapViewSDK

Conflicts:
	MapViewSDK/Controllers/MapViewController.m