Merge branch 'dev' of...

client/src/Main.tsx

client/src/actions/presentation.ts

client/src/interfaces/ApiModels.ts

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

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

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

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

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

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

...ationEditor/components/slideSettingsComponents/Images.tsx

...ditor/components/slideSettingsComponents/Instructions.tsx

...r/components/slideSettingsComponents/QuestionSettings.tsx

...onEditor/components/slideSettingsComponents/SlideType.tsx

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

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

client/src/pages/views/JudgeViewPage.test.tsx

client/src/pages/views/JudgeViewPage.tsx

client/src/pages/views/components/JudgeScoreDisplay.tsx

...t/src/pages/views/components/JudgeScoringInstructions.tsx

client/src/pages/views/components/PresentationComponent.tsx