fixes for chat client / server
Merge remote-tracking branch 'origin/master'