added user_encoding to AgentImportFile and ResourceImportFile

Conflicts:
	app/controllers/agent_import_files_controller.rb
	app/controllers/resource_import_files_controller.rb
	spec/dummy/db/schema.rb