Todo ya!!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/resources/client/View/LoginChat.java
	src/main/webapp/login.css
Todo ya!!!!