Bellcom <=> Ringsted merge

Merge between os2dagsorden 2.0 and ringsted changes