#198 Is Modified
Merge branch 'master' into modified

Conflicts:
	src/PrizmMainProject/Forms/MainChildForm/ChildForm.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs
	src/PrizmMainProject/Forms/Settings/SettingsViewModel.cs
	src/PrizmMainProject/Properties/Resources.resx
Merge pull request #435 from olga-jane/master

Update O_Morozova
correct adding pipes in railcar
Merge pull request #430 from olga-jane/modified

Modified feature
Merge pull request #436 from olga-jane/Morozova_BugFix

Morozova fix adding pipe to railcar
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditViewModel.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs