add devise backend
merge changes
fix gemfile