Chatbox

Merging the chatbox branch to master