Merge branch 'uicleanup-new-grouporder' into foodcoop-adam-new