Merge branch 'master' of https://github.com/MejriAymen/mejriPfe
Merge branch 'master' of https://github.com/MejriAymen/mejriPfe
Merge branch 'master' of https://github.com/MejriAymen/mejriPfe
Merge branch 'master' of https://github.com/MejriAymen/mejriPfe
Merge branch 'master' of https://github.com/MejriAymen/mejriPfe
Merge branch 'master' of https://github.com/MejriAymen/mejriPfe
Merge branch 'master' of https://github.com/MejriAymen/mejriPfe
Merge branch 'master' of https://github.com/MejriAymen/mejriPfe
Merge branch 'master' of https://github.com/MejriAymen/mejriPfe
Merge branch 'master' of https://github.com/MejriAymen/mejriPfe
Merge branch 'master' of https://github.com/MejriAymen/mejriPfe
Merge branch 'origin' of https://github.com/MejriAymen/mejriPfe

Conflicts:
	GestionLabo-war/src/java/org/cnss/labCenter/managedBean/ResultatManagedbean.java
	GestionLabo-war/web/gestionResultat/AjouterResultat.xhtml
	GestionLabo-war/web/gestionResultat/authentificationRresultat.xhtml