EDIT

merge trunk into cdm3.3 branch

remove descriptionSeparated from FeatureTree #3678

No idea why the data was updated automatically, but commit this as all tests run, we may revert this change if necessary

adapt test data for failing test

some fixes for modell change branche

Update script for termtype and some other, remove InstitutionType and COntinent, update idInVocabulary, ...

change some names in molecular and update the update script

merge trunk to branch cdm-3.3

merge trunk to cdm-3.3 branch

use strings for recordBasis (#2615 und #3544)