Refactor to support new role categories on controllers
Merge branch 'master' of https://github.com/digitalabs/DatasetImporter