edit mapview, annotationView
Merge branch 'master' of https://github.com/VNiOS/ARShop

Conflicts:
	ARShop/BeNCAnnotationView.m
edit mapview , annotationview