Merge develop into master

Finished the chat module