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

Conflicts:
	Projects/FireMonitor/Modules/AutomationModule/AutomationModuleLoader.cs
	Projects/FireMonitor/Modules/AutomationModule/ViewModels/LayoutProcedurePartViewModel.cs