Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
update norwegian translation
Merge pull request #14 from tamland/master

update norwegian translation