Bugfixes: issues  #307 and #296
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_bugfixes

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.Designer.cs
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
Merge pull request #346 from olga-jane/Protsenko_bugfixes

Protsenko bugfixes