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

Conflicts:
	Projects/Common/FiresecServiceAPI/SKD/SKDCard.cs
	Projects/Common/SKDDriver/SKDDatabaseService/SKDDatabaseService.cs
	Projects/FireAdministrator/Modules/SkudModule/DataTemplates/Dictionary.xaml
	Projects/FireAdministrator/Modules/SkudModule/Designer/DesignerCanvas.cs
	Projects/FireAdministrator/Modules/SkudModule/SKDModule.cs
	Projects/FireAdministrator/Modules/SkudModule/SKDModule.csproj