re #856 - Only remove empty categories
re #753 - Manage zones from within the manager application
Merge branch 'feature/753-police' into staging