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
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
Temporary Capybara performance regression fix
Specs ran in 54 seconds instead of 28 seconds with 1.1
Anyone else seeing this before I investigate it?
small spec performance tweaks
fix seeding for Mongoid
squ
remove unwanted logging [ci skip]
adds ability to sort on belongs_to columns with Mongoid
Merge pull request #1454 from imageoptimiser/master

Optimise images (411 KB reduction)