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

Conflicts:
	Projects/FireAdministrator/Modules/GroupControllerModule/Devices/Views/Logic/DeviceLogicView.xaml