set correct hierarchy
changed locales
Merge branch 'feature/hierarchy' into develop