add data model liyazhou
Merge branch 'liyazhou'
Merge branch 'Wubin' of https://github.com/kingmacrobo/iOS
delete some zhushi
Merge branch 'master' of https://github.com/kingmacrobo/iOS into Wubin
wubin