no message
Merge branch 'm1'

Conflicts:
	IMessage/IMessage.xcodeproj/project.xcworkspace/xcuserdata/shifeng.xcuserdatad/UserInterfaceState.xcuserstate