removed uncompilable code, finished AlarmScreen
removed unused imports, some minor edits
fixed merge conflicts
Merge branch 'master' of https://github.com/finninde/fellesprosjekt