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

Conflicts:
	Servis/Desktop/bin/Debug/Desktop.exe.config
	Servis/Desktop/bin/Debug/Desktop.vshost.exe.config
	Servis/Desktop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Servis/Desktop/obj/Debug/Desktop.csproj.FileListAbsolute.txt
	Servis/Desktop/obj/Debug/Desktop.csprojResolveAssemblyReference.cache
	Servis/MassService/bin/MassService.pdb
	Servis/MassService/obj/Debug/MassService.pdb
	Servis/Servis.v12.suo
	Servis/Servis/bin/Servis.dll
	Servis/Servis/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Servis/Servis/obj/Debug/Servis.csproj.FileListAbsolute.txt
	Servis/Servis/obj/Debug/Servis.dll