Merge pull request #190 from olga-jane/merge_Kulish_Sidorov

Merge kulish sidorov
read-write Pipe Size, read Pipe Tests
Merge remote-tracking branch 'origin/master' into O_Morozova

Conflicts:
	src/Data/DAL/Hibernate/PipeTestRepository.cs
	src/Data/DAL/Setup/IPipeTestRepository.cs
	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/Forms/Settings/SettingsXtraForm.resx
update O_Morozova branch
update Setting ViewModel
update Settings form
add Tests for current pipe size
return PipeTestResult
Unit Test
fix combobox to textedit
Merge pull request #191 from olga-jane/O_Morozova

O Morozova - Settings ViewModel
Merge remote-tracking branch 'origin/master' into RailcarPipes

Conflicts:
	src/Data/Data.csproj
	src/Domain/Entity/Setup/PipeTest.cs
	src/PrizmMainProject/Properties/licenses.licx