tttt
654565
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/Desktop_MarkupCompile.i.cache
	Servis/Desktop/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
	Servis/Desktop/obj/Debug/TempPE/Service
References.Service.Reference.cs.dll
	Servis/Mass.Data/obj/Debug/Mass.Data.csproj.FileListAbsolute.txt
	Servis/Servis.v12.suo