Merge branch 'conflang-mc5' into 'master'

Integration of ConfLang and SchemaLang

See merge request !18
1 job for master in 44 seconds (queued for 5 seconds)