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

Conflicts:
	Projects/FireAdministrator/Modules/PlansModule/Designer/Designer/DesignerCanvas.cs
	Projects/FireAdministrator/Modules/PlansModule/Views/ElementsView.xaml
	Projects/FireAdministrator/Modules/PlansModule/Views/PlansTreeView.xaml