Screen grouping added
Merge branch 'development' of github.com:Indholdskanalen/indholdskanalen into development