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

Gemfile

@@ -18,6 +18,7 @@ gem 'mongoid'
 gem "mongo_session_store-rails3"
 gem 'mysql2'
 gem "net-ldap", "~> 0.3.1"
+gem 'nokogiri'
 gem 'radius'
 gem 'rake'
 gem 'ruby-debug19'