Feature/devise branch