Fix Catergories and Assertions for Control import/export
Fix Control creation on Directive page
Merge pull request #625 from reciprocity/feature/fix-converter-categories

Fix for import/export breakage due to Category changes