Merge branch 'master' of github.com:zeisler/jasmine-rails into zeisler-master

Conflicts:
	lib/tasks/jasmine-rails_tasks.rake

Author: searls

lib/jasmine_rails/runner.rb

@@ -36,7 +36,7 @@ def override_rails_config
       end
 
       def get_spec_runner(spec_filter)
-        app = ActionController::Integration::Session.new(Rails.application)
+        app = ActionDispatch::Integration::Session.new(Rails.application)
         path = JasmineRails.route_path
         JasmineRails::OfflineAssetPaths.disabled = false
         app.get path, :console => 'true', :spec => spec_filter
@@ -53,4 +53,4 @@ def run_cmd(cmd)
       end
     end
   end
-end
+end