Merge branch 'develop' into 'feature/sequence-button-update'

# Conflicts:
#   sade-projects/textgrid/templates/tmpl1/js/goldenconfig.js