Merge branch 'dev' into 'feature/edit'
# Conflicts: # frontend/components/view/Suggest.vue # frontend/config.js # frontend/nuxt.config.js # frontend/pages/main/edit.vue
# Conflicts: # frontend/components/view/Suggest.vue # frontend/config.js # frontend/nuxt.config.js # frontend/pages/main/edit.vue