test
Merge branch 'master' of https://github.com/dandy-kun/projet.git

Conflicts:
	src/main/java/com/projet/model/dao/VoituresDAO.java
	src/main/java/com/projet/model/dao/impl/VoituresDAOImplJPA.java
	src/test/java/com/projet/model/manager/impl/ProjetManagerImplTest.java