RoundRobin Server
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cliente4/bin/classes/colla/client/implementations/DeveloperViewer.class
	Cliente4/bin/classes/colla/client/implementations/KeepAliveClient.class
	Cliente4/bin/classes/colla/client/implementations/TCP_Server.class
	Cliente4/bin/classes/colla/client/implementations/gui/ChatWindowGUI$1.class
	Cliente4/bin/classes/colla/client/implementations/gui/ChatWindowGUI$2.class
	Cliente4/bin/classes/colla/client/implementations/gui/ChatWindowGUI.class
	Cliente4/bin/classes/colla/client/implementations/gui/DeveloperViewerGUI$JList_contacts_Listener.class
	Cliente4/bin/classes/colla/client/implementations/gui/DeveloperViewerGUI.class
	Cliente4/nbproject/private/private.xml
	Host Viewer/src/colla/host/implementations/KeepAliveClient.java
	Host Viewer/tempTask.class
	Kernel/build/classes/colla/api/interfaces/CollAMessage.class
	Kernel/build/classes/colla/api/interfaces/CollAServer.class
	Kernel/build/classes/colla/api/interfaces/CollASession.class
	Kernel/build/classes/colla/api/interfaces/CollAUser.class
	Kernel/build/classes/colla/kernel/enumerations/HostOps.class
	Kernel/build/classes/colla/kernel/enumerations/ServerOps.class
	Kernel/build/classes/colla/kernel/messages/client/AddGroup.class
	Kernel/build/classes/colla/kernel/messages/client/ChatTransmitMessage.class
	Kernel/build/classes/colla/kernel/messages/client/ConfirmAddGroup.class
	Kernel/build/classes/colla/kernel/messages/client/DeveloperViewerDisconnect.class
	Kernel/build/classes/colla/kernel/messages/client/DeveloperViewerLogin.class
	Kernel/build/classes/colla/kernel/messages/client/GetAvailableHosts.class
	Kernel/build/classes/colla/kernel/messages/client/GetGroups.class
	Kernel/build/classes/colla/kernel/messages/client/GetHost.class
	Kernel/build/classes/colla/kernel/messages/client/JoinAGroup.class
	Kernel/build/classes/colla/kernel/messages/client/MapConnection.class
	Kernel/build/classes/colla/kernel/messages/client/MessageChat.class
	Kernel/build/classes/colla/kernel/messages/client/MessageThroughServer.class
	Kernel/build/classes/colla/kernel/messages/client/SignUp.class
	Kernel/build/classes/colla/kernel/messages/client/TaskSend.class
	Kernel/build/classes/colla/kernel/messages/client/TaskTrasmit.class
	Kernel/build/classes/colla/kernel/messages/client/UpdateUser.class
	Kernel/build/classes/colla/kernel/messages/host/HostLogin.class
	Kernel/build/classes/colla/kernel/messages/host/HostRegister.class
	Kernel/build/classes/colla/kernel/messages/host/HostUpdate.class
	Kernel/build/classes/colla/kernel/messages/host/MapConnection.class
	Kernel/build/classes/colla/kernel/messages/server/AddGroupResponse.class
	Kernel/build/classes/colla/kernel/messages/server/GetGroupsResponse.class
	Kernel/build/classes/colla/kernel/messages/server/PingToClient.class
	Kernel/build/classes/colla/kernel/messages/server/RetransmitMessage.class
	Kernel/build/classes/colla/kernel/messages/server/SendAvailableHostsToClient.class
	Kernel/build/classes/colla/kernel/messages/server/SendHostsToClient.class
	Kernel/build/classes/colla/kernel/messages/server/ServerHostLoginAnswer.class
	Kernel/build/classes/colla/kernel/messages/server/ServerHostRegisterAnswer.class
	Kernel/build/classes/colla/kernel/messages/server/TaskSend.class
	Kernel/src/colla/kernel/enumerations/HostOps.java
	Kernel/src/colla/kernel/enumerations/ServerOps.java
	Kernel/src/colla/kernel/messages/client/TaskTrasmit.java
	Kernel/src/colla/kernel/messages/host/HostUpdate.java
	Kernel/src/colla/kernel/messages/host/MapConnection.java
	Kernel/src/colla/kernel/messages/server/TaskSend.java
	SuperServer4/build/classes/colla/server/implementations/SuperServer$1.class
	SuperServer4/build/classes/colla/server/implementations/SuperServer.class
	SuperServer4/src/colla/server/implementations/SuperServer.java