change a lot
Merge branch 'master' of github.com:lzwjava/rocket-chat