removed uncompilable code, finished AlarmScreen
removed unused imports, some minor edits
fixed merge conflicts
change populate
Merge branch 'master' of https://github.com/finninde/fellesprosjekt
fix
Merge branch 'master' of github.com:finninde/fellesprosjekt
Fixed logic to viewscreen adn added some methods to GUIRequest
fixed mergeconflicts
made clientconnection a singleton, somewhat at least
Merge pull request #26 from finninde/clientconnection_singleton

made clientconnection a singleton, somewhat at least
building calendarscreen, modified and added TODOs
Delete config.prop
Made and implemented calendar
added updateParticipantStatus
added listeners
Merge pull request #28 from finninde/wienMainScreen

Wien main screen
Fixed mergeconflicts
cleaned imports
Merge pull request #29 from finninde/finn

calendar buttongrid