查看图片大图
Merge branch 'master' of https://github.com/easemob/sdkexamples-ios

Conflicts:
	ChatDemo-UI/ChatDemo-UI/Class/AppDelegate.m