merge-update from trunk
minor
merge-update of trunk and disabling GUI-Control separation
updated operations to use the new TermEditorInput and also added pop-up warnings when,
Committing changes to definedtermeditor after merge from branch