Merge pull request #1 from jun-lu/master

获取更新
Merge pull request #2 from jun-lu/master

获取更新最新from lujun
Merge pull request #3 from jun-lu/master

获取更新from jun
Merge pull request #4 from jun-lu/master

获取更新
Merge pull request #5 from jun-lu/master

获取更新
ChatRoom信息的修改

点击修改按钮弹出dialog进行信息框的修改
ChatRoom信息的修改

ChatRoom信息的修改
Merge pull request #4 from CKHuang/master

ChatRoom信息的修改