Merge branch 'dev' of...

.gitignore

.vscode/settings.json

.vscode/tasks.json

client/src/Main.tsx

client/src/actions/competitionLogin.ts

client/src/actions/types.ts

client/src/interfaces/ApiModels.ts

client/src/interfaces/ApiRichModels.ts

client/src/interfaces/ViewParams.ts

client/src/pages/admin/AdminPage.tsx

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

client/src/pages/login/components/CompetitionLogin.tsx

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

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

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

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

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

client/src/pages/presentationEditor/styled.tsx

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

client/src/pages/views/AudienceViewPage.tsx