Chat feature
Merge remote-tracking branch 'origin/feature/chat'
Merging conficts