chatbar update
chatbar merge
chatbar merge
Merge remote-tracking branch 'origin/master'