Merge branch 'develop' of https://github.com/Vizzuality/cartodb into develop

app/controllers/superadmin/users_controller.rb

@@ -8,7 +8,7 @@ class Superadmin::UsersController < Superadmin::SuperadminController
     # BEWARE. don't get clever. This is all explicit because of mass assignment limitations
     @user = User.new
 
-    current_user.in_database.run('SET statement_timeout TO 600000')    
+    User.db.run('SET statement_timeout TO 600000')    
     if attributes = params[:user]
       @user.username                = attributes[:username]
       @user.email                   = attributes[:email]   
@@ -31,7 +31,7 @@ class Superadmin::UsersController < Superadmin::SuperadminController
     end
     
     @user.save
-    current_user.in_database.run('SET statement_timeout TO DEFAULT')
+    User.db.run('SET statement_timeout TO DEFAULT')
     
     respond_with(:superadmin, @user)
   end