Merge branch 'dev' of https://github.com/foivz/tkipp24-projects-dmati… · foivz/tkipp24-projects-dmatijani-vlovric-dhegedusi-mmarkovin@d90dbc2