MAJ factoryReservation, test factoryPlageHoraireOK
MAJ factoryReservation, test factoryPlageHoraireOK
Merge branch 'master' of https://github.com/calystene/COO_Project

Conflicts:
	bdd/data_base.lck
	bdd/data_base.log
	bdd/data_base.properties
	src/presentation/MenuPrincipal.java
	src/presentation/client/FrameCreerClient.java
	src/presentation/client/PanelCreerClient.java