Added newest Client
Code tweaking
Added implementation for new sockets
Cleaned code
Added JavaDoc/Comments
Fixed comment
New new implementation for sockets
Change that did not get committed
Fixes to Client
Merge remote-tracking branch 'origin/Client2' into develop