fix conflicts

public/config/config.json

src/App.vue

src/assets/styles/base.css

src/components/Projects/DropdownMenuItem.vue

src/components/Projects/ProjectsMenu.vue

src/components/feature/FeatureListTable.vue

src/services/project-api.js

src/store/index.js

src/store/modules/feature.store.js

src/store/modules/feature_type.store.js

src/store/modules/map.store.js

src/store/modules/projects.store.js

src/views/Catalog.vue

src/views/My_account.vue

src/views/Projects.vue

src/views/feature/Feature_detail.vue

src/views/feature/Feature_edit.vue

src/views/feature/Feature_list.vue

src/views/feature_type/Feature_type_detail.vue

src/views/feature_type/Feature_type_edit.vue