EDIT

move static waterbody methods to NamedArea

update waterbody uuids in class, csv and TermsDataSet

split Waterbody and Country vocabulary and make waterbody an ordinary NamedArea #3700

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

readCsv Class changed

adding recordBasis to SpecimenOrObservationBase and removing some DerivedUnit classes (all #3378) and adding kindOfUnit to SpecimenOrObservationBase (except for according termType and vocabulary) #3568.

exchange modifier classes by DefinedTerm, add termtype to csv files, make term loader required constructor private

remove TdwgArea and add termType and idInVocabulary (#2998, #3478, #3479, #3539)

Merge trunk into CDM 3.3

lucene search: fixing grouping problem and basic indexing of term hierachies