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

Conflicts:
	Projects/FireMonitor/Modules/SKDModule/Organisations/ViewModels/OrganisationZoneViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/Organisations/ViewModels/OrganisationZonesViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/Organisations/Views/OrganisationsView.xaml
merge fix