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

Conflicts:
	src/main/java/com/projet/model/dao/ChauffeurDAO.java
	src/main/java/com/projet/model/dao/impl/ChauffeurDAOImplJPA.java
	src/main/java/com/projet/model/manager/ProjetManager.java