more workarounds for rails joins in scopes problems
Merge branch 'uicleanup' into foodcoop-adam-new