Merge remote-tracking branch 'origin/ViaNett-SMS'
Merge branch 'master' of https://github.com/Studentsamfunnet/SMS