set default shelf when importing resources next-l/enju_leaf#249

Conflicts:
	Gemfile
	app/controllers/resource_import_files_controller.rb
	app/models/resource_import_file.rb
	spec/dummy/db/schema.rb
	spec/models/resource_import_file_spec.rb
fixed merge