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

lib/tasks/page_content.rake

@@ -0,0 +1,11 @@
+# encoding: utf-8 
+
+namespace :add_content do
+  
+  task :build => :environment do
+  
+    ModuleApp.new.from_json(File.open("#{Rails.root}/vendor/built_in_modules/page_content/page_content.json").read).save
+
+  end
+  
+end