Merge branch 'master' of git://github.com/sferik/rails_admin

Conflicts:
	app/views/rails_admin/main/_form_filtering_multiselect.html.haml
	lib/rails_admin/config/fields/types/has_many_association.rb