33

333
Merge branch 'master' of https://github.com/tomggok/ShareBook

Conflicts:

DYiBan/YiBan/MVC/Controller/ShareBook/ShareBookMyQuanCenterViewControlle
r.m
	DYiBan/YiBan/MVC/Controller/ShareBook/ShareSettingViewController.m
	DYiBan/YiBan/MVC/Controller/WOS/WOSMapViewController.h
	DYiBan/YiBan/MVC/Controller/WOS/WOSMapViewController.m