ыук
Merge branch 'master' of https://github.com/shurupchik/magazin

Conflicts:
	Programma/Programma/Forms/AddEdCategoryForm.Designer.cs
	Programma/Programma/Forms/CategoryForm.Designer.cs
	Programma/Programma/Forms/ProvForm.Designer.cs
	Programma/Programma/Forms/ProvForm.resx