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

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

re-merge into develop
Revert to 254be242b0f33e571ee095b47cdf4f76ac750870
fixing error
fixing major merging issue