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

Conflicts:
	Projects/Common/SKDDriver/SKDDatabaseService/DataAccess/SKUD.dbml
	Projects/Common/SKDDriver/SKDDatabaseService/DataAccess/SKUD.dbml.layout
	Projects/Common/SKDDriver/SKDDatabaseService/DataAccess/SKUD.designer.cs
	Projects/FireMonitor/Modules/SKUDModule/AdditionalColumns/DataTemplates/Dictionary.xaml
	Projects/FireMonitor/Modules/SKUDModule/AdditionalColumns/Views/AdditionalColumnTypeDetailsView.xaml
	Projects/FireMonitor/Modules/SKUDModule/AdditionalColumns/Views/AdditionalColumnTypesView.xaml
	Projects/FireMonitor/Modules/SKUDModule/Departments/ViewModels/DepartmentsViewModel.cs