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

# By dujiepeng
# Via dujiepeng
* 'master' of https://github.com/easemob/sdkexamples-ios:
  update.
  update.

Conflicts:
	ChatDemo-UI/ChatDemo-UI.xcodeproj/project.pbxproj
	ChatDemo-UI2.0/ChatDemo-UI2.0.xcodeproj/project.pbxproj