first comit form eclipse
Add Logout
Login - logout css
edit stagiaire worked
test
Merge branch 'master' of
https://github.com/dariussy/JbossJsfEvaluation.git

Conflicts:
	pom.xml
	src/main/java/fr/treeptik/controlleur/AdministrateurControlleur.java
	src/main/java/fr/treeptik/controlleur/StagiaireControlleur.java
	src/main/java/fr/treeptik/dao/jpa/GenericJPADAO.java
	src/main/java/fr/treeptik/service/impl/StagiaireServiceImpl.java
	src/main/java/fr/treeptik/utils/SessionBean.java
	src/main/webapp/WEB-INF/faces-config.xml
	src/main/webapp/pages/protected/user/acceuil.xhtml
	src/main/webapp/pages/protected/user/editStagiaire.xhtml
	src/main/webapp/pages/public/login.xhtml
	src/main/webapp/template/common/commonHeader.xhtml
	src/main/webapp/template/common/commonLayout.xhtml
correction