#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
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 branch 'master' of https://github.com/olga-jane/prizm into Settings

Conflicts:
	src/Data/DAL/Mapping/PipeMap.cs
	src/Domain/Domain.csproj
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.Designer.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs
	src/PrizmMainProject/Properties/Resources.resx
fixed merge bug