Fix entity name.
Revert to old category module
Merge branch 'db_catgeories' into 1.3