Merge branch 'dev' of...

client/src/actions/presentation.test.ts

client/src/interfaces/ApiModels.ts

client/src/interfaces/ApiRichModels.ts

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

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

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

client/src/reducers/editorReducer.ts

client/src/reducers/presentationReducer.ts

server/app/apis/alternatives.py

server/app/apis/answers.py

server/app/apis/auth.py

server/app/apis/codes.py

server/app/apis/competitions.py

server/app/apis/components.py

server/app/apis/media.py

server/app/apis/misc.py

server/app/apis/questions.py

server/app/apis/slides.py

server/app/apis/teams.py

server/app/apis/users.py