Merge pull request #175 from olga-jane/master

Update Morozova_UI
Merge remote-tracking branch 'origin/master' into Morozova_UI
Update Settings form design
Project settings
Merge remote-tracking branch 'origin/O_Morozova' into Settings
Project settings and manufacturer
Merge remote-tracking branch 'origin/O_Morozova' into Settings

Conflicts:
	src/PrizmMainProject/Forms/Settings/SaveSettingsCommand.cs
	src/PrizmMainProject/Forms/Settings/SettingsViewModel.cs
	src/UnitTests/Forms/Settings/SaveSettingsCommandTest.cs
Plate Manufacturers + fix of cyrrilic db issue
Merge remote-tracking branch 'origin/master' into Settings

Conflicts:
	src/Data/Data.csproj
	src/PrizmMainProject/Forms/Settings/SettingsViewModel.cs
add combobox in inspection operation grid
Merge remote-tracking branch 'origin/O_Morozova' into Morozova_UI
Merge branch 'Morozova_UI' of https://github.com/olga-jane/prizm into Morozova_UI

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
Merge remote-tracking branch 'origin/master' into Morozova_UI

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
update Settings UI
Unit test
project table in db
Check on null
Merge remote-tracking branch 'origin/master' into Settings

Conflicts:
	src/PrizmMainProject/Forms/Settings/SaveSettingsCommand.cs
	src/PrizmMainProject/Forms/Settings/SettingsViewModel.cs
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.cs
	src/PrizmMainProject/PrizmModule.cs
	src/UnitTests/Forms/Settings/SaveSettingsCommandTest.cs
change column size in inspection grid
Merge remote-tracking branch 'origin/master' into Morozova_UI

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs