Redo excel field mapping (again)
Merge branch 'case-importer' into staging2