fix bug
make diff in dev
Merge branch 'master' of https://github.com/freecoder-zrw/Easychat