updated counting row_num
cleaned up

Conflicts:
	app/controllers/agent_import_files_controller.rb
	app/controllers/resource_import_files_controller.rb