jj
Merge branch 'master' of https://github.com/julentv/Chat.git

Conflicts:
	Chat/src/es/deusto/ingenieria/ssdd/chat/client/controller/ChatClientController.java