Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine

Conflicts:
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb

app/models/user/user.rb

@@ -52,5 +52,9 @@ class User
     value = values.detect {|value| value.attribute_field_id == field_id} rescue nil
     value ? value : self.attribute_values.build
   end
+
+  def self.from_id(id)
+    User.find(id) rescue nil
+  end
   
 end