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
config: defer model loading until referenced
spec Config::LazyModel
Merge pull request #1428 from taavo/defer_model_loading

Defer model loading
Refs #1428, only one configuration block per model allowed
Don't allow a second block evaluation for a model's config when configuration has already been accessed.
raising error for double block evaluation does not fit with Active reloading of models and rails_admin do … end.
reset model instead
remove useless code
warning for lazy loading
Update README.md
trying to fix CI for Mysql
Merge branch 'master' of github.com:sferik/rails_admin
LazyModel: refactor to remove unnecessary #store method
Set colorpicker line-height to normal
Merge pull request #1432 from christophermanning/issue-1298

Set colorpicker line-height to normal
rdoc [ci skip]