kau shleif
merge fix
1
2
4
5
Merge branch 'master' of github.com:xbadcode/Rubezh

Conflicts:
	Projects/Common/Common.GK/Common.GK.csproj
	Projects/Common/Controls/Controls.csproj
	Projects/FireAdministrator/Modules/GroupControllerModule/Devices/ViewModels/NewDeviceViewModel.cs