modif+ajoutInfoProfil
Merge remote-tracking branch 'origin/master' into mick2

Conflicts:
	target/classes/omw/controllers/AjaxReserverServlet.class