Merge branch 'develop' into educoder

Gemfile

@@ -15,6 +15,8 @@ unless RUBY_PLATFORM =~ /w32/
     gem 'rqrcode_png'
     gem 'roo-xls'
     gem 'newrelic_rpm'
+    gem 'seventeen_mon'
+    gem 'mobinfo'
   end
   gem 'certified'
   gem 'net-ssh', '2.9.1'
@@ -22,8 +24,6 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'nokogiri'
 end
 
-gem 'seventeen_mon'
-gem 'mobinfo'
 gem 'simple_xlsx_reader'
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'

app/controllers/ec_courses_controller.rb

@@ -1,10 +1,10 @@
 #encoding: utf-8
 class EcCoursesController < ApplicationController
   layout 'base_ec'
-  before_filter :find_ec_course, :except => [:create, :get_calculation_data, :sync_all_course_data]
+  before_filter :find_ec_course, :except => [:create, :get_calculation_data, :sync_all_course_data, :search_courses]
   before_filter :find_year, :only => [:create, :get_calculation_data]
-  before_filter :require_login, :except => [:sync_all_course_data]
-  before_filter :ec_auth, :except => [:search_courses]
+  before_filter :require_login, :except => [:search_courses, :correlation_course]
+  before_filter :ec_auth, :except => [:sync_all_course_data, :search_courses, :correlation_course]
   skip_before_filter :verify_authenticity_token, :only => [:crud_targets, :crud_score_level, :sync_all_course_data, :search_courses,
                                                            :correlation_course, :delete_course]