added scope to fix failing login tests
merge conflict fixed
Merge branch 'master' of github.com:federicomaffei/WorkMap