Feature/category and category user update

a0da7146478638e5dafe8c1729606b7317f6bd29