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

Conflicts:
	Projects/Common/Controls/Controls.csproj
	Projects/Common/Infrastructure.Client/BaseBootstrapper.cs
	Projects/Common/Infrastructure.Client/Infrastructure.Client.csproj
	Projects/Common/Infrastructure.Common/Services/Layout/ILayoutPartDescription.cs
	Projects/Common/Infrastructure.Common/Services/Layout/LayoutPart.cs
	Projects/Common/Infrastructure.Common/Services/Layout/LayoutPartDescription.cs
	Projects/FireAdministrator/FireAdministrator/FireAdministrator.csproj
	Projects/FireAdministrator/Modules/DevicesModule/Devices/ViewModels/DeviceViewModel.cs
	Projects/FireAdministrator/Modules/DevicesModule/Zones/ViewModels/ZoneViewModel.cs
	Projects/FireAdministrator/Modules/LayoutModule/LayoutModule.cs
	Projects/FireAdministrator/Modules/LayoutModule/ViewModels/LayoutDesignerViewModel.cs
	Projects/FireAdministrator/Modules/LayoutModule/ViewModels/LayoutElementsViewModel.cs
	Projects/FireAdministrator/Modules/LayoutModule/ViewModels/LayoutPartDescriptionViewModel.cs
	Projects/FireAdministrator/Modules/LayoutModule/ViewModels/LayoutPartViewModel.cs
	Projects/FireAdministrator/Modules/LayoutModule/Views/LayoutDesignerView.xaml
	Projects/FireAdministrator/Modules/LayoutModule/Views/LayoutDesignerView.xaml.cs
	Projects/FireMonitor/FireMonitor.sln
	Projects/FireMonitor/Modules/GKModule/GKModuleLoader.cs
 .