Conflicts:
	include/class_config.inc
	include/select/objectSelect/class_objectSelect.inc
	plugins/admin/groups/class_group.inc
	plugins/admin/ogroups/class_ogroup.inc
	plugins/personal/generic/class_user.inc