Merge pull request #281 from olga-jane/master

Update O_Morozova
update Settings form and add image to New Pipe
Revert "update Settings form and add image to New Pipe"

This reverts commit 367384d49d95ccbea9ac1b8661ed02ae709912ab.
Merge pull request #285 from olga-jane/master

Update O_Morozova
New pipe and settings update UI
Merge remote-tracking branch 'origin/master' into O_Morozova

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.Designer.cs
NewPipe - general parameters
Merge pull request #289 from olga-jane/master

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

O morozova