work on Authentication
Merge branch 'dev-local'