Merge branch 'dev' of...

client/src/Main.tsx

client/src/actions/editor.ts

client/src/actions/presentation.test.ts

client/src/actions/presentation.ts

client/src/actions/types.ts

client/src/interfaces/ApiModels.ts

client/src/interfaces/ApiRichModels.ts

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

.../pages/presentationEditor/PresentationEditorPage.test.tsx

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

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

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

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

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

.../src/pages/presentationEditor/components/RndComponent.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