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

Conflicts:
	Projects/Common/FiresecServiceAPI/FiresecAPI.csproj
	Projects/Common/FiresecServiceAPI/IFiresecServiceSKUD.cs
	Projects/Common/SKDDriver/SKDDriver.csproj
	Projects/FireMonitor/Modules/GKModule/Journal/ViewModels/ArchiveFilter/ArchiveFilterViewModel.cs
	Projects/FireMonitor/Modules/GKModule/Journal/ViewModels/ArchiveFilter/ChechBoxItemList.cs
	Projects/FiresecService/FiresecService.SKUD/FiresecServiceSKUD.cs
	Projects/FiresecService/FiresecService/Service/FiresecService.SKUD.cs
	Projects/FiresecService/FiresecService/Service/SafeFiresecService.cs