CoreData变更..运行的话记得删除掉!!!!重新安装!!!!...聊天功能working...
Merge branch 'master' of https://github.com/hxx0215/DoctorFei

Conflicts:
	DoctorFei_iOS/DoctorFei_iOS/Base.lproj/Main.storyboard