Feature/conference chat merge

Merged Andrea Gianarda requested to merge feature/conference_chat_merge into master

Merge request reports