re-merge into develop
Merge pull request #40 from thehelpsf/feature/chat-ui

re-merge into develop