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
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]
Merge branch 'master' of github.com:sferik/rails_admin
Merge pull request #1431 from taavo/tiny_lazy_model_refactor

LazyModel: refactor to remove unnecessary #store method
add an option to UTF-8
Merge pull request #1436 from hidenba/master

Add the original encoding at CSV Export
use safe_send instead of send for association's value
Merge branch 'release/0.1'