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

app/controllers/application_controller.rb

@@ -61,7 +61,7 @@ class ApplicationController < ActionController::Base
     respond_to do |format|
       format.html do
         session[:return_to] = request.url
-        redirect_to login_path and return
+        redirect_to login_url(:host => CartoDB.account_host) and return
       end
       format.json do
         head :unauthorized