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

Conflicts:
	Projects/FireMonitor/Modules/GKModule/Journal/Views/ArchiveFilterView.xaml