Fix
Merge branch 'master' of github.com:xbadcode/Rubezh

Conflicts:
	Projects/Common/FiresecServiceAPI/XManager/UpdateConfigurationHelper.Descroptors.cs