* 解决冲突
* 群主信息显示BUG
Merge remote-tracking branch 'origin/master'