Fixed Relation scopes for STI models.
Fixed role-based associations.
See rails/rails#3548 for details.
Merge branch 'master' into rails-4

Conflicts:
	config/initializers/model_associations.rb
	lib/rails_dynamic_associations/active_record/associations.rb