fix
Revert "merge"

This reverts commit 202892a4329e915c0a070bafebcdb16fdc392c45.

Conflicts:
	Projects/Common/Common.GK/BinaryDatabase/KauChildrenHelper.cs
	Projects/FireMonitor/Modules/GKModule/ViewModels/DeviceCommandsViewModel.cs
	Projects/GKSDK/GKSDK/DeviceCommandViewModel.cs
	Projects/GKSDK/GKSDK/DeviceViewModel.cs
	Projects/GKSDK/GKSDK/JournalsViewModel.cs
	Projects/GKSDK/GKSDK/MainViewModel.cs
	Projects/GKSDK/GKSDK/ZoneViewModel.cs
	Projects/Installers/GKFiresecInstaller/FiresecInstaller/SDK/Files.wxs
watcher additional states
Merge branch 'master' of github.com:xbadcode/Rubezh

Conflicts:
	Projects/Common/Common.GK/Common.GK.csproj
	Projects/Common/Common.GK/Drivers/RSR2/RSR2_Siren_Helper.cs
	Projects/Common/Common.GK/Drivers/RSR2/RSR2_Table_Helper.cs
	Projects/Common/Common.GK/Patcher.cs
	Projects/Common/Controls/Controls.csproj
	Projects/Common/FiresecServiceAPI/XModels/Driver/XDriverType.cs
	Projects/FSAgent/FSAgentServer/PatchManager.cs
	Projects/FiresecOPCServer/FiresecOPCServer/PatchManager.cs
	Projects/FiresecService/FiresecService/PatchManager.cs
	Projects/GKOPCServer/GKOPCServer/PatchManager.cs
fix
new ns
Merge branch 'master' of github.com:xbadcode/Rubezh