add message_type to messages
Merge branch 'master' of https://github.com/CruGlobal/godchat