fix #8162 adapt terms to new package structure in TaxEditor
Cleanup
ref #6190 removing svn property place holder in first line of code - java files
fix #5379
merge-update from trunk
merged/implemented cdm3.3 model adaptations
refactored NumberWithLabelElement to a single constructor with java.lang.Number as argument
refactoring of package names for consistency