Some norwegian updates
Resolved nb.coffee merge conflicts.
Merge branch 'mestad-patch-1'