commit_Charles

modification simple ajout pour ne pas causer de tort
Merge remote-tracking branch 'origin/master'

Conflicts:
	GestionHoteliere/GestionHoteliere/obj/Debug/AjoutItemInventaire.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/ConsoleAdmin.g.i.vb

	GestionHoteliere/GestionHoteliere/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	GestionHoteliere/GestionHoteliere/obj/Debug/GestionHoteliere.vbproj.FileListAbsolute.txt

	GestionHoteliere/GestionHoteliere/obj/Debug/GestionHoteliere_MarkupCompile.i.cache
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/CategorieFourniture.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/Chambre.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/Employe.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/EquipementGeneriqueChambre.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/EquipementRecreatif.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/Facture.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/Forfait.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/Fournisseur.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/Fourniture.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/Hotel.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/Pays.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/Province.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/Salle.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/TypeChambre.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
principales/Ville.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifCategorieFourniture.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifChambre.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifEmploye.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifEquipementGenChambre.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifEquipementRecreatif.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifFacture.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifForfait.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifFournisseur.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifFourniture.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifHotel.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifPays.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifProvince.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifSalle.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifTypeChambre.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Interfaces
secondaires/ModifVille.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/Menu.g.i.vb
	GestionHoteliere/GestionHoteliere/obj/Debug/ReservationSalle.g.i.vb