版面小改
Merge branch 'layout'

Conflicts:
	XpendAll.xcodeproj/project.pbxproj
	XpendAll/AnnotationImage.png
	XpendAll/MyAnnotaionView.h
	XpendAll/MyAnnotaionView.m
	XpendAll/UILabel+AutoFrame.h
	XpendAll/UILabel+AutoFrame.m
	XpendAll/ViewController.m
	XpendAll/address.png
	XpendAll/govermentData.json
	XpendAll/kmlData.json
	XpendAll/other.png
	XpendAll/productViewController.xib
	XpendAll/shopDetailViewController.xib
	XpendAll/shopViewController.xib
	XpendAll/shopWithKmlViewController.m
	XpendAll/shopWithKmlViewController.xib
	XpendAll/suspendRadarViewController.h
	XpendAll/suspendRadarViewController.m
	XpendAll/suspendRadarViewController.xib
	XpendAll/suspendViewController.xib
合好惹