Update README.md
Merge branch 'develop' into feature/message-panel