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

Conflicts:
	Servis/Desktop/bin/Debug/Desktop.vshost.application
	Servis/Desktop/bin/Debug/Desktop.vshost.exe.manifest
	Servis/Desktop/obj/Debug/AdminWindow.g.cs
	Servis/Desktop/obj/Debug/AngebotWindow.baml
	Servis/Desktop/obj/Debug/AngebotWindow.g.cs
	Servis/Desktop/obj/Debug/Desktop.csproj.FileListAbsolute.txt
	Servis/Desktop/obj/Debug/Desktop.csprojResolveAssemblyReference.cache
	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/KundenWindow.g.cs
	Servis/Desktop/obj/Debug/MainWindow.baml
	Servis/Desktop/obj/Debug/MainWindow.g.cs
	Servis/Desktop/obj/Debug/MitarbeiterWindow.g.cs
	Servis/Mass.Data/obj/Debug/Mass.Data.csproj.FileListAbsolute.txt
	Servis/Service/obj/Debug/Service.csproj.FileListAbsolute.txt
	Servis/Service/obj/Debug/Service.csprojResolveAssemblyReference.cache
	Servis/Servis.v12.suo