archive fix
Merge branch 'master' of github.com:xbadcode/Rubezh
OPS, OPZ, OPK
Merge branch 'master' of github.com:xbadcode/Rubezh

Conflicts:
	Projects/Common/Controls/Controls.csproj
	Projects/Common/FiresecServiceAPI/XManager/UpdateConfigurationHelper.cs
	Projects/FireAdministrator/Modules/GroupControllerModule/MPTs/ViewModels/MPTViewModel.cs
merge fix