bug fixing
Merge remote-tracking branch 'origin/ClientCategories' into ClientCategories