AT: committing changes to the TaxEditor Post merge and tree conflicts
AT: commiting recent merge from trunk
Refactoring of selection elements. Additional minor refactoring. Fixed a bug with Translation Editor (#2752)
AT: Committing working from home files
Created a DefinedTermEditor for States
Committing changes to definedtermeditor after merge from branch