Fix
bhjk.dvhjkchjknMerge branch 'master' of github.com:ikishik/dsdstore

Conflicts:
	app/models/import_job.rb
Fix