Rassemblage
Merge remote-tracking branch 'origin/next' into next

Conflicts:
	nio.finalchat/src/nio/finalchat/ChatRoomFinal.java
	nio.multicast/src/nio/multicast/implementation/Option.java