small changes and cleanup in these classes.
Merge branch 'master' of https://github.com/scbasma/Metonix1.0

Conflicts:
	src/modell/AlarmModel.java
	src/modell/MeetingModel.java