Client creates a message object when it receives chat messages.
Merge remote-tracking branch 'origin/master'
A few fixes
Merge remote-tracking branch 'origin/master'