case 3123 - Kilden & bronden frontpages, and content.
Merge branch 'case-3123' into artesis_clean