Issue #419 task1
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings
Issue #419 task2
#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
Issue #419 tasks 2-5
Fix of unit test according to changes in MillRepo
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings

Conflicts:
	src/DatabaseMigrator/Scripts/CreateSchemeObjects.sql
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditViewModel.cs
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
Merge pull request #435 from olga-jane/master

Update O_Morozova
Added unit test for checking task 4 in issue #419
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
Merge pull request #432 from olga-jane/Settings

Settings
Merge branch 'master' into sidorov_PipeSaveNotification

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/NewEdit/SavePipeCommand.cs
	src/PrizmMainProject/Forms/Settings/SaveSettingsCommand.cs
	src/PrizmMainProject/Properties/Resources.resx