fix broken user tests
fix merge conflicts
Merge branch 'master' of github.com:H6C5/dinner_dash into development-checkout
fix error with sign in first path