merging so nigel can use user auth for pantry views
fixed merge conflict with user-controller branch