changed structs to classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/mass_import_tool.rb