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

Conflicts:
	Projects/Common/Controls/Controls.csproj
	Projects/Common/Infrastructure.Common/Windows/ViewModels/ShellViewModel.cs
	Projects/Common/Infrastructure.Common/Windows/Views/ShellView.xaml