Resolved conflicts

Conflicts:
app/controllers/data_controller.rb
app/controllers/users_controller.rb