Merge branch 'master' of https://github.com/easemob/sdkexamples-ios

Conflicts:
	ChatDemo-UI2.0/ChatDemo-UI2.0.xcodeproj/project.pbxproj
冲突