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

Conflicts:
	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/Common/SKDDriver/SKDDatabaseService/Translators/Base/TranslatorBase.cs
	Projects/Deploy/Scripts/SKUD_Create.sql
	Projects/Deploy/Scripts/SKUD_Relations.sql
	Projects/Deploy/Scripts/SKUD_SP_Save.sql
	Projects/FireMonitor/Modules/SKUDModule/Intervals/Holidays/ViewModels/HolidayYearViewModel.cs
	Projects/FireMonitor/Modules/SKUDModule/Intervals/Holidays/ViewModels/OrganisationHolidaysYearViewModel.cs