add combobox in inspection operation grid
Merge remote-tracking branch 'origin/master' into O_Morozova

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
Merge pull request #213 from olga-jane/master

Update O_Morozova
fixed mapping for pipe test
Merge pull request #217 from olga-jane/master

Update O_Morozova
Merge pull request #218 from olga-jane/O_Morozova

O Morozova - Settings ViewModel