Merge origin/ecolexpert-branche1 into ecolexpert-branche1

Conflicts:
	src/main/webapp/scolarite/absences_aux_cours.xhtml
	src/main/webapp/scolarite/affichage_dossier.xhtml
	src/main/webapp/scolarite/attestation.xhtml
	src/main/webapp/scolarite/convocation.xhtml
	src/main/webapp/scolarite/effectif_de_classes.xhtml
	src/main/webapp/scolarite/fiche_de_presence.xhtml
	src/main/webapp/scolarite/fiche_inscription.xhtml
	src/main/webapp/scolarite/fiche_pour_note.xhtml
	src/main/webapp/scolarite/listes_des_etudiants.xhtml
	src/main/webapp/scolarite/modification_dossier.xhtml
	src/main/webapp/scolarite/photos_inscrites.xhtml
	src/main/webapp/scolarite/prises_en_charges.xhtml
	src/main/webapp/scolarite/recherche.xhtml
	src/main/webapp/scolarite/reduction.xhtml
	src/main/webapp/scolarite/retards_aux_cours.xhtml
	src/main/webapp/scolarite/versements_classe.xhtml
	src/main/webapp/scolarite/versements_etudiant.xhtml
	src/main/webapp/scolarite/versements_formation.xhtml
Merge origin/ecolexpert-branche1 into ecolexpert-branche1

Conflicts:
	src/main/webapp/scolarite/absences_aux_cours.xhtml
	src/main/webapp/scolarite/affichage_dossier.xhtml
	src/main/webapp/scolarite/attestation.xhtml
	src/main/webapp/scolarite/convocation.xhtml
	src/main/webapp/scolarite/effectif_de_classes.xhtml
	src/main/webapp/scolarite/fiche_de_presence.xhtml
	src/main/webapp/scolarite/fiche_inscription.xhtml
	src/main/webapp/scolarite/fiche_pour_note.xhtml
	src/main/webapp/scolarite/listes_des_etudiants.xhtml
	src/main/webapp/scolarite/modification_dossier.xhtml
	src/main/webapp/scolarite/photos_inscrites.xhtml
	src/main/webapp/scolarite/prises_en_charges.xhtml
	src/main/webapp/scolarite/recherche.xhtml
	src/main/webapp/scolarite/reduction.xhtml
	src/main/webapp/scolarite/retards_aux_cours.xhtml
	src/main/webapp/scolarite/versements_classe.xhtml
	src/main/webapp/scolarite/versements_etudiant.xhtml
	src/main/webapp/scolarite/versements_formation.xhtml
Merge origin/ecolexpert-branche1 into ecolexpert-branche1

Conflicts:
	src/main/webapp/scolarite/absences_aux_cours.xhtml
	src/main/webapp/scolarite/affichage_dossier.xhtml
	src/main/webapp/scolarite/attestation.xhtml
	src/main/webapp/scolarite/convocation.xhtml
	src/main/webapp/scolarite/effectif_de_classes.xhtml
	src/main/webapp/scolarite/fiche_de_presence.xhtml
	src/main/webapp/scolarite/fiche_inscription.xhtml
	src/main/webapp/scolarite/fiche_pour_note.xhtml
	src/main/webapp/scolarite/listes_des_etudiants.xhtml
	src/main/webapp/scolarite/modification_dossier.xhtml
	src/main/webapp/scolarite/photos_inscrites.xhtml
	src/main/webapp/scolarite/prises_en_charges.xhtml
	src/main/webapp/scolarite/recherche.xhtml
	src/main/webapp/scolarite/reduction.xhtml
	src/main/webapp/scolarite/retards_aux_cours.xhtml
	src/main/webapp/scolarite/versements_classe.xhtml
	src/main/webapp/scolarite/versements_etudiant.xhtml
	src/main/webapp/scolarite/versements_formation.xhtml
Merge origin/ecolexpert-branche1 into ecolexpert-branche1

Conflicts:
	src/main/webapp/parametres/gestion_pays.xhtml