Fix DEPRECATION WARNING for rails 4.0.0. ActionController::Integration to ActionDispatch::Integration.
Merge branch 'master' of github.com:zeisler/jasmine-rails into zeisler-master

Conflicts:
	lib/tasks/jasmine-rails_tasks.rake