CC-21 Insert new category if one is encountered
CC-21 Fixed bug when category is null on update
CC-21 Resolve conflict
Merge pull request #9 from TinyNova/CC-21

Cc 21