Merge branch 'kado4' into 'master'

Upgrade to a base for Kado 4

See merge request kado/kado-web!1
3 jobs for master