Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ChatTabClient.java
	src/ChatWindowClient.java
	src/Listener.java
	src/Receiver.java
	src/Transmitter.java
	src/multicast_server.java
whisper done.