modif
Merge branch 'master' of https://github.com/rdubigny/projet_web.git

Conflicts:
	theatre/src/com/gr15/dao/ReservationDaoImpl.java