Merge of jxAdmin and jxExtCats