Merge branch 'design_team' into ldap

app/models/user/user.rb

@@ -21,6 +21,14 @@ class User
   belongs_to :role
   has_and_belongs_to_many :sub_roles
   accepts_nested_attributes_for :attribute_values, :allow_destroy => true
+
+  def self.current
+    Thread.current[:user]
+  end
+
+  def self.current=(user)
+     Thread.current[:user] = user
+  end
   
   scope :remote_account, where(:nccu_id.ne => nil)