Merge branch 'inherited_resources_collection_fix' of https://github.com/tanordheim/cancan into tanordheim-inherited_resources_collection_fix

Use collection instead of end_of_association_chain in the inherited_resources integration, as per suggested by aq1018

Merge branch 'pass_action_to_accessible_by' of https://github.com/amw/cancan into amw-pass_action_to_accessible_by

Use `Mongoid::Matchers#matches?` instead of  a database query in `MongoidAdapter#matches_conditions_hash?`