Add ActivityBase and IHasCustomActivitySettingsEditor
Modify condition editor
ConditionsDialog: Include/Exclude dropdown changed to radio buttons
Merge branch 'dev'