Maj partie stage
Synchro git
Synchro git (2)
Merge branch 'master' of https://github.com/EsupPortail/esup-pstage.git

Conflicts:
	esup-pstage-web-jsf-servlet/src/main/java/org/esupportail/pstage/web/controllers/SessionController.java
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/__offreEtape1.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/__offreEtape2.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/__offreEtape3.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/__offreEtape3Contacts.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_buttonCreationEtablissement.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_creationOffreEtape02Etab.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_creationOffreEtape05ModifEtab.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_detailsOffre.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_detailsOffreContacts.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_detailsOffreDiffusion.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_detailsOffreEtudiant.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_diffusionCentreOffreEtape1.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_etablissementForm.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_formService.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_modifContactEtape0.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_rechercheEtablissementOngletsSansForm.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_rechercheEtablissementResultatsColumns.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_rechercheOffre.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_rechercheOffreNbResultats.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_rechercheOffreResultatsColumns.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_subPanelSelectContact.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/_commun/_subPanelSelectContact2.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/stage/_panel_rechercheViseur.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/stage/_stageTemplate.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/stage/contactsEtablissement.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/stage/liste_centres.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/stage/liste_criteres.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/stage/rattachementPersonnel_ajout.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/stage/rattachementPersonnel_resultat.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/stage/recapitulatifOffreCentre.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/stage/recapitulatifOffreEtabCentre.xhtml
	esup-pstage-web-jsf-servlet/src/main/webapp/stylesheets/stage/rechercheEtablissement.xhtml