Signed-off-by: sofien <sofien@pc-sofien.esprit.tn>
Merge branch 'master' of
https://github.com/diariataannaniang/annaTommyRepo.git

Conflicts:
	tn.edu.esprit.gl8.annaTommyWeb/WebContent/pages/admin/manageUsers.xhtml
	tn.edu.esprit.gl8.annaTommyWeb/src/tn/edu/esprit/gl8/annaTommyWeb/beans/MrBean.java