Merge pull request #38 from thehelpsf/feature/chat-ui

Feature/chat ui
Revert "Feature/chat ui"
Merge pull request #39 from thehelpsf/revert-38-feature/chat-ui

Revert "Feature/chat ui"
re-merge into develop