fix
Issue #651: fixed folder location
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_files2
Update pipe mill status
fixe MillPipeNewEditXtraForm
Merge branch 'master' into settingCrashFix
Merge remote-tracking branch 'origin/master' into Morozova_BugFix

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.Designer.cs
Merge pull request #753 from olga-jane/settingCrashFix

Setting crash fix
Merge pull request #755 from olga-jane/Protsenko_files2

Files : fixed folder location
Merge pull request #758 from olga-jane/O_Morozova

Set pipe mill status readonly
Merge pull request #761 from olga-jane/Morozova_BugFix

MillPipeNewEditXtraForm doesn't display at design
Merge remote-tracking branch 'origin/master' into Morozova_Report