fix chat functionality
Merge branch 'master' of https://github.com/MitulP91/watrcoolr