Added support for categories
Merge branch 'master' of https://github.com/Rob-pw/Total_IT