Onglet Competence
Merge branch 'master' of github.com:imie-source/CDI-N-09_G1

Conflicts:
	FR/GTC/WebContent/WEB-INF/JProjet.jsp
	FR/JPA_EJB/build/classes/org/imie/service/ServiceGestionEcoleJPA.class