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

Conflicts:
	Projects/FireAdministrator/Modules/DevicesModule/Plans/ViewModels/ZonePropertiesViewModel.cs