Alex 15:41
Merge branch 'master' of github.com:imie-source/CDI-N-09_G1

Conflicts:
	FR/JPA_ServletJPA/WebContent/WEB-INF/TP13.jsp
	FR/JPA_ServletJPA/WebContent/WEB-INF/TP4.jsp