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

Conflicts:
	Projects/FireMonitor/Modules/PlansModule/ViewModels/PlanTreeViewModel.cs
Restoring layout properties from server