big up revision code + redefinition UserBean/User
Merge branch 'master' of https://github.com/adrienrouquet/cpe-projet.git

Conflicts:
	WebContent/content/chat/addContactResult.jsp
	src/ServerCore/ChatServlet.java
Merge branch 'master' of https://github.com/adrienrouquet/cpe-projet.git
Big up !!!
Merge branch 'master' of https://github.com/adrienrouquet/cpe-projet.git

Conflicts:
	WebContent/content/chat/UnapprovedContact.jsp
	src/ServerCore/ChatServlet.java