Patch CanCan::ControllerResource to support strong_parameters (CanCan v1.6)
Pass 'true' to respond_to, as the params method is often private or protected
backport with_model removal
backported adapter version updates, spec fixes
merge with spec updates
switch ruby to 2.0
rails version bump
fix broken mongoid specs
merge pull #711 by fillman (Replace meta_where with squeel, fix pending rspec tests)
failed test now marked as pending
merge with strong_parameters by 3months
Merge remote-tracking branch 'ogerman/rails4'

Conflicts:
	.ruby-version
	lib/cancan/controller_resource.rb
	spec/cancan/controller_resource_spec.rb