bugs fix
Merge branch 'master' into easemob-dev