Merge pull request #113 from jun-lu/master

get update
Merge pull request #114 from jun-lu/master

get update
Merge pull request #115 from jun-lu/master

update
提交
Merge branch 'master' of https://github.com/CKHuang/webchat
Merge pull request #129 from CKHuang/master

get update