added devise and dasboard
fixed merge conflicts