Merge branch 'development' of github.com:Indholdskanalen/client into development