Merge branch 'various_bugs' into nccu_master

Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

Gemfile

@@ -12,14 +12,13 @@ gem 'exception_notification' # Send error trace
 gem 'execjs'
 gem 'jquery-rails'
 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', '> 2.1', '< 3.0.0'
 gem 'mongoid-tree', :require => 'mongoid/tree'
 gem "mongo_session_store-rails3"
 gem 'mysql2'
@@ -32,7 +31,7 @@ gem 'resque', :require => 'resque/server' # background jobs
 gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
-gem 'ruby-debug19'
+# gem 'ruby-debug19'
 gem 'rubyzip'
 
 gem 'sunspot_mongo'
@@ -40,26 +39,26 @@ 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 '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 'contacts'
+#gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.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'
+gem 'redis-namespace'
+gem 'redis-search'
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -71,6 +70,11 @@ end
 
 
 group :test, :development do
+  gem 'pry'
+  gem 'pry-remote'
+  gem 'pry-stack_explorer'
+  gem 'pry-debugger'
+  
   gem "sunspot-rails-tester"
   gem 'spork'
   gem 'database_cleaner'  #Strategies for cleaning databases. Can be used to ensure a clean state for testing.