update config
Merge branch 'master' into lizmap-web-client-3