resolving conflicts
Merge branch 'master' of https://github.com/Louspirit/PROJET_RESERVATION

Conflicts:
	src/ProjetReservations/EnregistrementReservations/enregistrement.Designer.cs
	src/ProjetReservations/EnregistrementReservations/enregistrement.cs

resolution conflits