get password from db
Merge branch 'dev'