Remove heartbeat
Merge remote-tracking branch 'origin/next' into next

Conflicts:
	nio.finalchat/src/nio/finalchat/ChatRoomFinal.java