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
Update app/controllers/rails_admin/main_controller.rb

Use Kaminari.config.param_name for personalization of param name
This is usufull for traslate the param view in url
Update spec/controllers/main_controller_spec.rb

Add spec for kaminari custom param_name
Merge branch 'master' of github.com:sferik/rails_admin
Merge branch 'master' of github.com:sferik/rails_admin
relax nested_form dependency to include 0.3.X
update specs to support nested_form 0.3.X
Merge pull request #1418 from taavo/update_to_nested_form_0.3

Update to nested form 0.3
Bump version to 0.3.0
moved unit specs to rails_admin (easier integration with alternate file (spec <=> code) editors plugins)
fix #1423, history should not go through i18n to retrieve entries.
Thanks a lot @bamorim !
dummy_app/Gemfile clean strong_parameters at master dependency
support for ActiveSupport::TimeWithZone in mongoid adapter
Merge pull request #1382 from elsupergomez/patch-1

Update app/controllers/rails_admin/main_controller.rb
fix spec
fix bug affecting field visibility setting with bindings
Typo on install generator: lib/generators/rails_admin/install_generator.rb
Merge pull request #1426 from zzak/patch-1

Typo on install generator: lib/generators/rails_admin/install_generator.rb