fixed chat bug(server crash)
merge origin
merge origin