Merge remote-tracking branch 'origin/visu_forest_0_1' into visu_forest_0_1

# Conflicts:
#	src/components/eventLocation.vue