Implemented new layouts
Merge branch 'development' of github.com:aakb/indholdskanalen_service into development