TestWithNetbean-delete Cat nao
Merge origin/master

Conflicts:
	src/ChatMessage.java