Merge branch 'dev' of...

.vscode/settings.json

client/src/actions/types.ts

client/src/enum/ComponentTypes.ts

client/src/interfaces/ApiModels.ts

client/src/interfaces/ApiRichModels.ts

client/src/pages/admin/AdminPage.test.tsx

.../src/pages/admin/competitions/CompetitionManager.test.tsx

.../src/pages/presentationEditor/components/Alternatives.tsx

...resentationEditor/components/CompetitionSettings.test.tsx

...sentationEditor/components/ImageComponentDisplay.test.tsx

...s/presentationEditor/components/ImageComponentDisplay.tsx

client/src/pages/presentationEditor/components/Images.tsx

.../src/pages/presentationEditor/components/RndComponent.tsx

...ages/presentationEditor/components/SettingsPanel.test.tsx

...src/pages/presentationEditor/components/SlideSettings.tsx

client/src/pages/presentationEditor/components/SlideType.tsx

...pages/presentationEditor/components/TextComponentEdit.tsx

client/src/pages/presentationEditor/components/Texts.tsx

client/src/pages/presentationEditor/components/Timer.tsx

client/src/pages/presentationEditor/components/styled.tsx