Merge remote-tracking branch 'origin/master'

Conflicts:
	GM241/Classes/RequetesBD.cs
	GM241/Fenetres/InventaireGestion/InventaireGestion.xaml.cs
	GM241/GM241.csproj
	GM241/GM241.v12.suo