* fix some int warning
Merge remote-tracking branch 'origin/master'
* 添加表情UI，更新协议
Merge branch 'master' of https://github.com/99im/IMiPhone

Conflicts:
	IMiPhone.xcodeproj/project.pbxproj
	IMiPhone/MessageDataProxy.m
	IMiPhone/zh-Hans.lproj/Main.storyboard