Fixed chat
Merge branch 'develop' of github.com:Elao/curvytron into develop