LAST effort
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03 into all-finalfixes

Conflicts:
	src/gui/EditMeeting.java
	src/gui/MainScreen.java
Merge pull request #79 from Gruppe01/all-finalfixes

LAST effort