jjjjj
gggggg
Merge branch 'develop' of https://github.com/kenal/MaasFaktura into develop

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