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

Conflicts:
	Projects/FireAdministrator/Modules/SKDModule/Organisations/ViewModels/OrganisationDetailsViewModel.cs
	Projects/FireAdministrator/Modules/SKDModule/Organisations/ViewModels/OrganisationsViewModel.cs
merge fix
Merge remote-tracking branch 'origin/master'
commit
Merge branch 'master' of github.com:xbadcode/Rubezh
Merge branch 'master' of github.com:xbadcode/Rubezh
icons, installer
Merge branch 'master' of github.com:xbadcode/Rubezh

Conflicts:
	Projects/Common/Controls/Controls.csproj
	Projects/Common/SKDDriver/SKDDatabaseService/Translators/EmployeeTranslator.cs
	Projects/FireAdministrator/Modules/SKDModule/Organisations/Views/OrganisationsView.xaml
	Projects/FireMonitor/Modules/SKDModule/Employees/ViewModels/EmployeeDetails/EmployeeDetailsViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/Employees/ViewModels/EmployeeDetails/SelectDepartmentViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/Employees/ViewModels/EmployeesViewModel.cs