Remove category feature
Merge remote-tracking branch 'origin/feature/administration_upgrades' into develop