Merge branch 'nccu_master' into demo_site

Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb

Gemfile

@@ -6,6 +6,7 @@ gem "brakeman"
 gem 'bson_ext'
 gem 'carrierwave'
 gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
+gem "net-ldap", "~> 0.3.1"
 gem 'devise', '1.5.3'
 gem 'exception_notification' # Send error trace
 gem 'execjs'
@@ -14,27 +15,48 @@ gem 'jquery-ui-rails'
 
 gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 
+# gem "memcached", "~> 1.4.3"
+# gem "memcache-client"
+
 gem 'mini_magick'
 gem 'mongoid'
 gem 'mongoid-tree', :require => 'mongoid/tree'
 gem "mongo_session_store-rails3"
+gem 'mysql2'
 gem 'nokogiri'
 gem 'radius'
 gem 'rake'
+# gem 'remotipart'
 gem 'resque' # background jobs
 gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
+#gem 'rb-readline'
 gem 'ruby-debug19'
 gem 'rubyzip'
+
+gem 'sunspot_mongo'
+gem 'sunspot_solr'
+gem 'progress_bar'
+
 gem 'sinatra'
 #gem 'sinatra-contrib'
 gem 'sprockets'
+gem 'social-share-button'
+
 gem 'tinymce-rails'
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
-#gem 'contacts'
+gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux")
 
-gem "impressionist", :require => "impressionist", :path => "vendor/impressionist"
+
+gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git'
+
+gem 'redis','>= 2.1.1'
+gem 'chinese_pinyin', '0.4.1'
+# add rmmseg if you need search by segment words
+gem 'rmmseg-cpp-huacnlee', '0.2.9'
+gem 'redis-namespace','~> 1.0.2'
+gem 'redis-search', '0.7.1'
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -46,6 +68,7 @@ end
 
 
 group :test, :development do
+  gem "sunspot-rails-tester"
   gem 'spork'
   gem 'database_cleaner'  #Strategies for cleaning databases. Can be used to ensure a clean state for testing.
   gem "rspec", "~> 2.0"