Added in chatting functionality
Merge branch 'feature-chat' into develop