merge-update of trunk and disabling GUI-Control separation
rename FieldObservation -> FieldUnit #3566