verif TP13??
Merge branch 'master' of github.com:imie-source/CDI-N-09_G1

Conflicts:
	FR/JPA_ServletJPA/WebContent/WEB-INF/TP13.jsp
Merge branch 'master' of github.com:imie-source/CDI-N-09_G1
Merge branch 'master' of github.com:imie-source/CDI-N-09_G1
Merge branch 'master' of github.com:imie-source/CDI-N-09_G1
Merge branch 'master' of github.com:imie-source/CDI-N-09_G1
Merge branch 'master' of github.com:imie-source/CDI-N-09_G1
Merge branch 'master' of github.com:imie-source/CDI-N-09_G1
Merge branch 'master' of github.com:imie-source/CDI-N-09_G1
modif page accueil par login
Merge branch 'master' of github.com:imie-source/CDI-N-09_G1

Conflicts:
	FR/JPA_EJB/build/classes/org/imie/service/ServiceGestionEcoleJPA.class