#199 pipe coating DB changed
#199 Pipe coating
Merge branch 'master' into coating

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.Designer.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs
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
refresh fillDb.sql script for partly resolve issue #268
Merge pull request #283 from olga-jane/sidorov_fillDbUpdate

refresh fillDb.sql script for partly resolve issue #268
Merge branch 'coating' of https://github.com/olga-jane/prizm into coating
Merge branch 'coating' of https://github.com/olga-jane/prizm into coating
Merge pull request #282 from olga-jane/coating

Coating
Merge pull request #285 from olga-jane/master

Update O_Morozova