#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 #430 from olga-jane/modified

Modified feature