Add id to outgoing chat messages
Merge remote-tracking branch 'origin/development' into development