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

Conflicts:
	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/EmployeeTranslator.cs
	Projects/Common/SKDDriver/Scripts/Create.sql
	Projects/Common/SKDDriver/Scripts/Patches.sql
merge fix