chat 1.0
правки к чату
Merge remote-tracking branch 'origin/master' into chat_branch