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

Conflicts:
	Projects/Common/FiresecClient/FiresecManager/FiresecManager.SKD.cs
	Projects/Common/FiresecServiceAPI/SKD/Database/AdditionalColumn.cs
	Projects/Common/FiresecServiceAPI/SKD/Database/Card.cs
	Projects/Common/FiresecServiceAPI/SKD/Database/Document.cs
	Projects/Common/FiresecServiceAPI/SKD/Database/Employee.cs
	Projects/Common/FiresecServiceAPI/SKD/Database/Position.cs
	Projects/Common/SKDDriver/SKDDatabaseService/Translator/Translate.cs
	Projects/Common/SKDDriver/SKDDatabaseService/Translator/TranslateBack.cs
merge fix