Merge branch 'master' into ldap

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

lib/tasks/noko.rake

@@ -0,0 +1,13 @@
+# encoding: utf-8 
+
+namespace :nokogiri do
+  task :layout => :environment do
+  	  l = Design.first(:conditions => {:title => 'CCU'}).layout
+ 			l.layout_parts.destroy rescue nil
+ 			l.menu.destroy rescue nil
+ 			l.design.save
+ 			l = Design.first(:conditions => {:title => 'CCU'}).layout
+ 			l.file = File.open("#{Rails.root}/lib/noko/layout.html")  
+ 			l.design.save
+  end
+end