Started merging
Rebased with dev
Added TODOs and fixed merging
Refactored Category constructors
Added code review suggestions
Fixed a null variable.