update
Merge branch 'master' of https://github.com/Oksana-Ivanova/Cost_manager_desktop

Conflicts:
	Desktop/Desktop.v12.suo
	Desktop/Desktop/obj/Debug/Desktop.csproj.GenerateResource.Cache