Merge pull request #270 from emorency/feature/OPAL-1928-categories-edit-ui

OPAL-1928: categories edit ui
OPAL-1928: Fixing test for VariableTestPresenter