resolve: merge from dev

client/public/t8-circled.png

client/src/actions/editor.ts

client/src/interfaces/ApiModels.ts

client/src/interfaces/ApiRichModels.ts

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

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

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

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

client/src/pages/views/PresenterViewPage.tsx

client/src/reducers/editorReducer.ts

server/populate.py