fix
Merge remote-tracking branch 'origin/master' into SettinSaveFix
fix ValidationRule
Merge remote-tracking branch 'origin/master' into SettinSaveFix

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.cs
Merge pull request #774 from olga-jane/SettinSaveFix

Settin save fix