replacing resource_name with resource_class
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/csv_db.rb