Issue #225
Remove trash
Merge remote-tracking branch 'origin/master' into Settings

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditViewModel.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.Designer.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs
	src/UnitTests/Forms/PipeMill/Search/MillPipeSearchCommandTest.cs
fix merging
fix after merge
Merge pull request #410 from olga-jane/Settings

Settings - Issue #225 - adding inspection operations