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

Conflicts:
	Projects/Common/SKDDriver/SKDDatabaseService/DataAccess/SKD.dbml.layout
	Projects/Common/SKDDriver/SKDDatabaseService/DataAccess/SKD.designer.cs
	Projects/FireMonitor/Modules/GKModule/Journal/Views/ArchiveFilterView.xaml
merge fix