Merge branch 'master' into case-importer
Rework first two screens of excel importer
Shrink the previously giant buttons
Reorder fields
Restore case type category text lost in merge
Merge branch 'case-importer' into staging2