Merge remote-tracking branch 'origin/master'

Conflicts:
	tn.edu.esprit.gl8.annaTommyWeb/WebContent/pages/admin/manageUsers.xhtml
Signed-off-by: sofien <sofien@pc-sofien>
Merge remote-tracking branch 'origin/master'