Added Devise
Merge fix