add changed files on server 140.119.168.11

Conflicts:
	Gemfile
	app/controllers/pages_controller.rb
	app/views/orbit_bar/index.html.erb

.gitignore

@@ -20,7 +20,8 @@
 app/views/frontend
 /public/uploads/*
 public/assets/*
-public/site_feeds/*
 public/import_status.yml
 public/announcement_link_widget_en.json
 public/announcement_link_widget_zh_tw.json
+vendor/announcement-test
+vendor/news

Gemfile

@@ -1,8 +1,5 @@
 source 'https://rubygems.org'
 
-#social gems
-gem "omniauth-google-oauth2", "~> 0.2.1"
-
 #rails gem
 gem 'rails', '~> 4.1.0'
 gem 'sanitize'
@@ -31,8 +28,7 @@ gem 'nokogiri'
 gem 'httparty'
 
 #database
-# gem 'mongoid', github: "mongoid/mongoid"
-gem 'mongoid', '~> 4.0.2'
+gem 'mongoid', github: "mongoid/mongoid"
 
 #file uploading and carrierwave
 gem "mini_magick", "3.5.0"
@@ -46,6 +42,9 @@ gem 'usagewatch_ext'
 gem 'ckeditor'
 gem 'unicorn'
 gem 'zhconv'
+
+gem "net-ldap", "~> 0.3.1"
+
 gem 'time_difference'
 gem 'execjs'
 gem 'therubyracer'
@@ -85,11 +84,8 @@ end
 #ask
 gem 'gotcha'
 
-#caching observers
-gem 'mongoid-observers'
-
 #desktop
-# gem 'angularjs-rails', '~> 1.2.20'
-# gem 'angular-ui-bootstrap-rails', '~> 0.11.0'
-# gem 'jquery_mousewheel_rails', '~> 3.1.11.3'
+gem 'angularjs-rails', '~> 1.2.20'
+gem 'angular-ui-bootstrap-rails', '~> 0.11.0'
+gem 'jquery_mousewheel_rails', '~> 3.1.11.3'