Adding Ability#merge
checked for ActionContoller::Base instead of just ActionContoller
Fix to handle MetaWhere and non-MetaWhere conditions correctly.
Merge pull request #625 from rogercampos/merging

Adding Ability#merge
Merge pull request #632 from andhapp/fix-issue-327

Fix to handle MetaWhere and non-MetaWhere conditions correctly.
Fix for issue-644 to allow users to specify a mix of can and cannot rules with mongo.
Merge pull request #645 from andhapp/issue-644

Allow users to specify a mix of can and cannot rule for mongoid
Fixes Nested Resource Loading
initialise attributes after a resource is created by an InheritedResources controller
Add specs for resource attributes.

Remove inconsistent line breaks.
Refactor out attribute assignment
Fix pull request 640. For some reason github didn't allow a clean merge althought there weren't any conflicts. Fix it so that it's easier to just merge via the UI.
Fix for issue 560 where joins could be thrown away by ActiveRecordAdapter::merge_joins
Merge pull request #618 from spatil/master

Check for defined ActionController::Base instead ActionController
Merge pull request #650 from andhapp/fix-pull-request-486

Fixes Nested Resource Loading
Merge pull request #653 from andhapp/fix-pull-request-640

Init attributes in InheritedResources controller w/ specs
load ostruct for OpenStruct used in spec
clearing leftover whitespace
removing project status section from readme since contributors are now kind enough to keep tabs on the issue tracker
updating changelog