less herder includes (so less recompilation); remove client from conversation when socket broke
Merge remote-tracking branch 'origin/master'
fixed bug in addContactWindow; add smiley (bug not the code for display it); remove warnings