updated message and chat send
Merge origin/master