dev folder with db sql

merge login into master