refs #42 Column widths for Import History change
Merge branch 'newImport' of github.com:joshsoftware/21nautica into newImport
Added Test cases for import controller
refs #50
Change in factory file to fix circleci load error
Change in factory files
conflicts resolved
Conflicts:
	app/assets/javascripts/import_items.js.coffee
	app/controllers/import_items_controller.rb
test case fix for import controller testcase
added testcases for import items controller
test cases for import items controller
TestCases for movement helpers