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

Conflicts:
	Projects/Common/Controls/TimePicker.xaml
	Projects/Common/Controls/TimePicker.xaml.cs
	Projects/Common/FiresecServiceAPI/XModels/Filters/XArchiveFilter.cs
	Projects/Common/GKProcessor/GKLicenseProcessor.cs
	Projects/Common/GKProcessor/GKProcessorManager.cs
	Projects/Common/GKProcessor/Journal/EventNames.cs