Maybe dirty fix to get creditor to work for me.
Link to current_user should work event when User#to_param has been overridden.
Merge branch 'master' of github.com:gunn/rails_admin

Conflicts:
	app/views/layouts/rails_admin/_header.html.haml
	app/views/rails_admin/main/_form_text.html.haml
Merge branch 'master' of github.com:sferik/rails_admin
Merge branch 'master' of github.com:sferik/rails_admin
fix naming for preset filters
use safe_send instead of send for association's value
Merge branch 'release/0.1'
fix failing specs
Merge pull request #1429 from kopfmaschine/master

Fix variable naming with default visible filters
Merge pull request #1440 from hydrat/association_value_safe_send

Use safe_send instead of send for association's value
Specify carrierwave-mongoid from gem
ckeditor initialization fix
Merge branch 'master' of github.com:sferik/rails_admin
Removed trailing whitespace.
upgrade to capybara 2
guard against local variable potential name clash with underscores
Merge pull request #1444 from taavo/capybara_2

upgrade to capybara 2
Merge pull request #1448 from khoan/avoid-name-clash

guard against local variable potential name clash with underscores
Optimised images