reorder field obs and opening hours
Merge branch 'oc_export' into merge