注释
Merge branch 'master' of https://github.com/tiandiwo9/TXMapSDK-1-

Conflicts:
	TXMapSDK/SDK/TXTMapView/public/TXTCallout.h
	TXMapSDK/SDK/TXTMapView/public/TXTGraphic.h