alarm fiks
Merge branch 'master' of https://github.com/Fellesprosjekt/Kalender