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

Conflicts:
	Projects/Common/FiresecClient/Service/SafeFiresecService.SKD.cs
	Projects/Common/FiresecServiceAPI/IFiresecServiceSKD.cs
	Projects/Common/SKDDriver/SKDDatabaseService/DataAccess/SKD.dbml
	Projects/Common/SKDDriver/SKDDatabaseService/DataAccess/SKD.dbml.layout
	Projects/Common/SKDDriver/SKDDatabaseService/DataAccess/SKD.designer.cs
	Projects/Deploy/Scripts/SKUD_Create.sql
	Projects/FireMonitor/Modules/SKUDModule/Documents/ViewModels/DocumentViewModel.cs
	Projects/FireMonitor/Modules/SKUDModule/Documents/ViewModels/OrganisationDocumentsViewModel.cs
	Projects/FireMonitor/Modules/SKUDModule/Positions/ViewModels/PositionDetailsViewModel.cs
commit