shared database config
conflict fix
shared db fix
Merge branch 'release/default_roles'
User Schema fix
Merge branch 'master' of github.com:Plazr/plazr_auth
reverted back to local shared db