Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # front/src/components/Results.vue # front/src/components/ResultsDetailedView.vue # front/src/store/MainStore.js
File added
# Conflicts: # front/src/components/Results.vue # front/src/components/ResultsDetailedView.vue # front/src/store/MainStore.js