Reorder results to override orders applied up the chain (eg - scopes)
changed the translation of common attributes
Merge pull request #213 from piton/translate-common-attributes

I18n common attributes and Translate.attribute_name
Fixes squeel link is 404
Fixes meta_search link is 404
Merge pull request #215 from willnet/patch-1

Fixes 404 links
Add French locale

Translated the English locale to French (:fr)
Merge pull request #220 from ldavin/master

Add a French translation
Merge pull request #208 from pdf/reorder

Reorder results to override orders applied up the chain (eg - scopes)
Test with 1.9.3 and 2.0.0 in travis-ci
Merge pull request #222 from sanemat/feature/travis-ruby

Test with 1.9.3 and 2.0.0 in travis-ci
enable syntax highlighting on README
Merge pull request #226 from subosito/syntax-highlights

enable syntax highlighting on README
Resolve versions conflict between Squeel and Ransack
Merge pull request #232 from dexion/patch-1

Resolve versions conflict between Squeel and Ransack
Merge pull request #1 from ernie/master

update