Fix Gemfile.lock conflict
Fix routes config
Remove devise.rb
fix secret token
Fix user model attr_accessible