fix
fix
fix
fix
推送的聊天
fix
fix
Merge branch 'master' of github.com:zhaohaifeng/zhaohaifeng.github.com