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

Conflicts:
	src/main/java/com/projet/model/dao/LocationDAO.java
	src/main/java/com/projet/model/dao/impl/ClientsDAOImplJPA.java
	src/main/java/com/projet/model/dao/impl/LocationDAOImplJPA.java
Merge branch 'master' of https://github.com/dandy-kun/projet.git