Merge

diagram
merg
some
туц
for merg

asdas
no message
Merge branch 'vanchik' into develop

Conflicts:
	Login.Designer.cs
	Properties/Resources.Designer.cs
	Properties/Settings.Designer.cs