fix inconsistent doc
Merge branch 'develop' into delegate-annotation-sorting

Conflicts:
	MapView/Map/RMMapView.h