merge-update of trunk and disabling GUI-Control separation
rename FieldObservation -> FieldUnit #3566
Aligning Editor with 3.3 model changes. First phase commit which updates only the classes. Branch not compilable at the moment.
Implements suggested preliminary solution for #2399
had to rename the packages to make them compliant with buckminster