Clean up the socket client.
Merge branch 'master' of https://github.com/thiagoponte/trabalho-sd-np2-2014-1.git