Merge branch 'fix_category_table' of https://github.com/jgoodman/Freeside into jgoodm...