Fix for issue 560 where joins could be thrown away by ActiveRecordAdapter::merge_joins
Spec to test against nested joins being thrown away ala issue 560
Fixing Segmentation fault on aliasing
Add code for fixing issue #664 (regression in 1.6.8).
Add Code Climate badge
Merge pull request #655 from DavidMikeSimon/master

Fix for issue #560
Merge pull request #660 from fl00r/master

Segmentation fault on aliasing
Merge pull request #670 from andhapp/fix-issue-664

Namespaced Controllers not building new resource from params(regression 1.6.8)
Merge pull request #676 from brynary/master

Add Code Climate badge
Refold generated Ability comments at 80 characters

A lot of people still fold their code at 80 characters, so it is
nice to have generated code consider this.
show build status fro master branch
add contributing guide

[ci skip]
Merge pull request #708 from calebthompson/patch-1

Refold generated Ability comments at 80 characters
Issue #687: cancan inserting "AND (NULL)" at the end of sql

Ensure that empty conditions does not trigger unmergeable conditions
Merge pull request #765 from jonsgreen/issue/cancan_inserting_and_null_687

Issue #687: cancan inserting "AND (NULL)" at the end of sql
add gem version badge (thanks Gemfury)
Merge branch 'master' into 2.0