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

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