implemented new categories
refactoring
refactoring
Merge remote-tracking branch 'Develop/feture/NewCategories' into develop