sort order by end date then by name
Merge branch 'uicleanup' into foodcoop-adam-new