Merge branch 'feature/struktura' into develop
Merge branch 'develop'