aaaaa
ccccc
ppppppppppppp
Merge branch 'develop' of https://github.com/kenal/MaasFaktura into develop

Conflicts:
	Servis/Desktop/bin/Debug/Desktop.vshost.application
	Servis/Desktop/bin/Debug/Desktop.vshost.exe.manifest
	Servis/Desktop/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
	Servis/Desktop/obj/Debug/TempPE/Service
References.Service.Reference.cs.dll
	Servis/Servis.v12.suo
	Servis/WpfScheduler/obj/Debug/WpfScheduler_MarkupCompile.i.cache
Merge branch 'develop' of https://github.com/kenal/MaasFaktura into develop

Conflicts:
	Servis/Desktop/bin/Debug/Desktop.application