updated Email-Addresse of .travis.yml
Merge branch 'master' of https://github.com/ngiger/oddb.org
Merge branch 'master' of https://github.com/ngiger/oddb.org
updated Gemfile.lock as per request from travis-ci
Merge branch 'master' of https://github.com/ngiger/oddb.org
Merge branch 'master' of https://github.com/ngiger/oddb.org
Merge branch 'master' of https://github.com/ngiger/oddb.org
Merge branch 'master' of https://github.com/ngiger/oddb.org
Add optional parameter for compatibility