Push working chat
Fix stuff
Merge branch 'feature/61-chat'
fix conflicts