mucho stuff
Merge branch 'master' of https://github.com/X3N0-Life-Form/Reseaux-MessengerApp

Conflicts:
	src/client/Client.java
	src/client/ClientMessageManager.java
	src/client/handling/UDPClient.java
	src/client/handling/UDPHandlerClientDiscuss.java
	src/client/handling/UDPHandlerClientSending.java
	src/view/ChatMain.java
	src/view/ChatPanel.java
	src/view/ContactListWindow.java