Mail test
Merge branch 'master' of github.com:xbadcode/Rubezh into origin_master

Conflicts:
	Projects/FireAdministrator/Modules/DiagnosticsModule/ViewModels/DiagnosticsViewModel.cs