Merge pull request #543 from biblimathieu/master

Add french locale file
Use response.total instead of response.response['numFound'] in CatalogHelper.
Remove UTF-8 char from stylesheet to attempt fix for #544
Try again with a UTF-8 pragma. Restore original code license.
support rails 4 and 3.x at the same time
Don't send :page to solr.
kill RSolr#paginate. calculate start/rows ourself in #add_paging_to_solr
create separate gemfiles for rails3 and rails4 for travis to use
ignore gemfile.lock files
make sure bundler is up-to-date
fix test_support_generator syntax
fix test that was checking for :paginate
expect people to come with a copy of rails and bundler pre-installed
dump environment when running under travis.
pollute more stylesheets with @charset UTF-8
add our charset to the css under travis only.
that was one way to make the tests pass.. remove errant exit
update rsolr_request_error handling to fallback on Rails exception handling in exceptional cases (e.g when solr is completely broken). also, don't try to do a redirect and a 500 status at the same time, that's not cool.
use prerelease of database_cleaner
bump to 4.1.0