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

Conflicts:
	Projects/Common/SKDDriver/DataAccess/SKD.dbml.layout
	Projects/Common/SKDDriver/DataAccess/SKD.designer.cs