Fixed import crash as a result of non-existing categories
Control import working, cancel msg avoiding, systems and proc import clean_up
Fix typo
Merge remote-tracking branch 'origin/develop' into feature/control_import_fixes
Merge pull request #164 from reciprocity/feature/control_import_fixes

Control import additions, flash message avoid, proc import clean_up