PipeTestResult
Merge remote-tracking branch 'origin/sidorov_MillViewModelRepo' into Settings
Required Test Results functionality
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/IMillRepository.cs
	src/PrizmMainProject/Forms/PipeMill/MillRepository.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditViewModel.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.Designer.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
PipeTestResult: saving inspectors and status
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings

Conflicts:
	src/Domain/Domain.csproj
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditViewModel.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.Designer.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs
	src/PrizmMainProject/Forms/PipeMill/Search/MillPipeSearchXtraForm.cs
	src/PrizmMainProject/PrizmApplication.csproj
	src/PrizmMainProject/Properties/Resources.Designer.cs
	src/PrizmMainProject/Properties/Resources.resx
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings

Conflicts:
	src/PrizmMainProject/Properties/Resources.Designer.cs
Unit test and methods description
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings
DB migration changes
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings

Conflicts:
	src/Data/DAL/Mapping/PipeMap.cs
	src/Domain/Domain.csproj
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.Designer.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs
	src/PrizmMainProject/Properties/Resources.resx
add lockUp control in searchPipe form for adequately displaying of StatusPipe Enum
fixed merge bug
Merge pull request #284 from olga-jane/Settings

Settings
Merge pull request #286 from olga-jane/sidorov_EnumInGrid

add lookUp control in searchPipe form for adequately displaying of Statu...
implement lookUpGrid control for translation PipeMillStatus Enum from resources
Merge pull request #287 from olga-jane/sidorov_EnumInGrid

implement lookUpGrid control for translation PipeMillStatus Enum from re...
Merge remote-tracking branch 'origin/master' into O_Morozova

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.Designer.cs