update of workspace
Workspace reset HL
Reset Henri
Merge branch 'master' of https://github.com/adrienrouquet/cpe-projet.git

Conflicts:
	WebContent/content/account/account.jsp
	WebContent/content/account/accountLogin.jsp
	WebContent/content/chat/chat.jsp
	WebContent/content/chat/contactWindow.jsp
Mini correction affichage Login