12
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Servis/Desktop/bin/Debug/Desktop.application
	Servis/Desktop/bin/Debug/Desktop.exe
	Servis/Desktop/bin/Debug/Desktop.exe.manifest
	Servis/Desktop/bin/Debug/Desktop.pdb
	Servis/Desktop/bin/Debug/Desktop.vshost.application
	Servis/Desktop/bin/Debug/Desktop.vshost.exe.manifest
	Servis/Desktop/bin/Debug/app.publish/Desktop.exe
	Servis/Desktop/obj/Debug/AddBugWindows.g.cs
	Servis/Desktop/obj/Debug/AdminEditWindow.g.cs
	Servis/Desktop/obj/Debug/AdminWindow.g.cs
	Servis/Desktop/obj/Debug/AngebotWindow.baml
	Servis/Desktop/obj/Debug/AngebotWindow.g.cs
	Servis/Desktop/obj/Debug/App.g.cs
	Servis/Desktop/obj/Debug/AuftrageWindow.g.cs
	Servis/Desktop/obj/Debug/AuftragsSucheWindow.g.cs
	Servis/Desktop/obj/Debug/BestellungWindow.g.cs
	Servis/Desktop/obj/Debug/Desktop.application
	Servis/Desktop/obj/Debug/Desktop.csproj.FileListAbsolute.txt
	Servis/Desktop/obj/Debug/Desktop.csprojResolveAssemblyReference.cache
	Servis/Desktop/obj/Debug/Desktop.exe
	Servis/Desktop/obj/Debug/Desktop.exe.manifest
	Servis/Desktop/obj/Debug/Desktop.g.resources
	Servis/Desktop/obj/Debug/Desktop.pdb
	Servis/Desktop/obj/Debug/Desktop_MarkupCompile.cache
	Servis/Desktop/obj/Debug/Desktop_MarkupCompile.i.cache
	Servis/Desktop/obj/Debug/Desktop_MarkupCompile.lref
	Servis/Desktop/obj/Debug/FertigWindow.g.cs
	Servis/Desktop/obj/Debug/GeneratedInternalTypeHelper.g.cs
	Servis/Desktop/obj/Debug/KalendarRadnikDodajWindow.g.cs
	Servis/Desktop/obj/Debug/KalendarRadnikWindow.g.cs
	Servis/Desktop/obj/Debug/KundenWindow.g.cs
	Servis/Desktop/obj/Debug/KundenWindowEdit.g.cs
	Servis/Desktop/obj/Debug/LieferantWindow.g.cs
	Servis/Desktop/obj/Debug/LieferantWindowEdit.g.cs
	Servis/Desktop/obj/Debug/LoginWindow.g.cs
	Servis/Desktop/obj/Debug/MainWindow.g.cs
	Servis/Desktop/obj/Debug/MaterialbestandWindow.g.cs
	Servis/Desktop/obj/Debug/MaterialienWindow.g.cs
	Servis/Desktop/obj/Debug/MitarbeiterWindow.g.cs
	Servis/Desktop/obj/Debug/MitarbeiterWindowEdit.g.cs
	Servis/Desktop/obj/Debug/NovaPorukaUserControl.g.cs
	Servis/Desktop/obj/Debug/PorukeWindow.g.cs
	Servis/Desktop/obj/Debug/PoslanePorukeUserControl.g.cs
	Servis/Desktop/obj/Debug/PrimljenePorukeUserControl.g.cs
	Servis/Desktop/obj/Debug/ProfileWindow.g.cs
	Servis/Desktop/obj/Debug/RechBaustellen.g.cs
	Servis/Desktop/obj/Debug/RechNaturstein.g.cs
	Servis/Desktop/obj/Debug/TechnikerWindow.g.cs
	Servis/Desktop/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
	Servis/Desktop/obj/Debug/TempPE/Service
References.Service.Reference.cs.dll
	Servis/Desktop/obj/Debug/showBugWindow.g.cs
	Servis/Servis.v12.suo