set up user stubs
Merge branch 'master' into permissions