fix function KindDto getKind(long id)
Merge branch 'kinds_custom_sort_fix_merge_errors'