entity
Merge remote-tracking branch 'origin/master'

Conflicts:
	GestionHoteliere/GestionHoteliere/ReservationSalle.xaml.vb