added basic devise config to project
fixed merge conflicts