merge

client/package-lock.json

client/src/actions/cities.ts

client/src/actions/editor.ts

client/src/actions/types.ts

client/src/actions/user.test.ts

client/src/actions/user.ts

client/src/enum/ComponentTypes.ts

client/src/interfaces/ApiModels.ts

client/src/interfaces/ApiRichModels.ts

...pages/admin/dashboard/components/NumberOfCompetitions.tsx

.../src/pages/admin/dashboard/components/NumberOfRegions.tsx

client/src/pages/admin/users/UserManager.tsx

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

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

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

...src/pages/presentationEditor/components/SettingsPanel.tsx

...t/src/pages/presentationEditor/components/SlideEditor.tsx

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

...esentationEditor/components/TextComponentDisplay.test.tsx

...es/presentationEditor/components/TextComponentDisplay.tsx