更换类查看xib上面东西不显示问题
Merge branch 'master' of https://github.com/liuyunMo/YunGou

Conflicts:
	YunGou/YunGou.xcodeproj/project.pbxproj