Wrapping sending and receiving messages in a custom class. Renaming Enum.
Merging Joca's changes and fixing conflicts at ServerClient.java

Conflicts:
ServerClient.java
No, this time we're really fixing the merge