Chatrooms

pull request for merging chatrooms as master is now old