Merge branch 'master' into coating

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.Designer.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs
Merge branch 'coating' of https://github.com/olga-jane/prizm into coating