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

Conflicts:
	Projects/Common/FiresecClient/FiresecManager/SKDHelpers/PhotoHelper.cs
	Projects/Common/SKDDriver/SKDDatabaseService/Translators/AdditionalColumnTranslator.cs
	Projects/FireMonitor/Modules/SKUDModule/SKDModule.csproj
merge fix, OnPainterFactoryEvent