Merge branch 'dev' of...

...t/src/pages/presentationEditor/PresentationEditorPage.tsx

...s/presentationEditor/components/BackgroundImageSelect.tsx

...ges/presentationEditor/components/CompetitionSettings.tsx

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

...resentationEditor/components/QuestionComponentDisplay.tsx

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

...src/pages/presentationEditor/components/SettingsPanel.tsx

.../src/pages/presentationEditor/components/SlideDisplay.tsx

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

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

...es/presentationEditor/components/TextComponentDisplay.tsx

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

...tationEditor/components/slideSettingsComponents/Texts.tsx

...tationEditor/components/slideSettingsComponents/Timer.tsx

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