Chatting is working right!

Working chat we've got
Merge conflicts related to chat fixed

Merge conflicts related to chat have now been fixed
Final Commit

Final Commit has been added