Merge branch 'following-users'

Author: mhartl

app/helpers/sessions_helper.rb

@@ -59,4 +59,4 @@ def log_out
   def store_location
     session[:forwarding_url] = request.original_url if request.get?
   end
-end
+end

app/models/user.rb

@@ -120,4 +120,4 @@ def create_activation_digest
       self.activation_token  = User.new_token
       self.activation_digest = User.digest(activation_token)
     end
-end
+end