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

Conflicts:
DYiBan/YiBan/MVC/Controller/ShareBook/ShareAddQuanViewController.m
ShareBook.xcodeproj/project.pbxproj
33

33