Update Rails 4.1. Update Gemfile
Add Devise#User
Merge develop into master