zone dao
Merge branch 'master' of ssh://ensibm.imag.fr/equipes/tpweb_isi1_jsp/tpweb
Merge branch 'master' of ssh://ensibm.imag.fr/equipes/tpweb_isi1_jsp/tpweb
merge
Merge branch 'master' of ssh://ensibm.imag.fr/equipes/tpweb_isi1_jsp/tpweb
Merge branch 'master' of https://github.com/arthur073/Billeterie

Conflicts:
	src/main/java/dao/ReservationDAO.java
Merge branch 'master' of https://github.com/arthur073/Billeterie

Conflicts:
	src/main/java/dao/AchatDAO.java
	src/main/java/dao/ReservationDAO.java
	src/main/webapp/WEB-INF/sql/requetes.properties
merge
Merge branch 'master' of https://github.com/arthur073/Billeterie
merge + travail stats
Merge branch 'master' of https://github.com/arthur073/Billeterie

Conflicts:
	src/main/java/controleur/ReservationControleur.java
	src/main/java/dao/AchatDAO.java