Fixes: #2313 Cleaning categories and objectTypes

Conflicts:
	plugins/admin/ogroups/class_ogroupManagement.inc