ready for merge, commit

comit for merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/chatserver/ClientHandler.java