Merge branch 'develop' into '107-ajout-d-une-option-lors-de-l-ajout-d-etape-existante-a-l-itineraire-pour-y-inclure-les-liens'

# Conflicts:
#   src/main/resources/resources/changelog.txt