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

Conflicts:
	Projects/Common/SKDDriver/DataAccess/SKD.dbml
	Projects/Common/SKDDriver/DataAccess/SKD.dbml.layout
	Projects/Common/SKDDriver/DataAccess/SKD.designer.cs
	Projects/Common/SKDDriver/Scripts/SKD/Create.sql
	Projects/Common/SKDDriver/Scripts/SKD/Patches.sql
	Projects/FireMonitor/Modules/SKDModule/Employees/Views/EmployeesView.xaml.cs
	Projects/FiresecService/FiresecService/app.config
merge fix