Make team chat work properly
Merge pull request #65 from exp/master

Make team chat work properly