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

Conflicts:
	src/gui/MainScreen.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch all-finalfixes
# Your branch is up-to-date with 'origin/all-finalfixes'.
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   src/gui/AddExternal.java
#	modified:   src/gui/CreateMeeting.java
#	modified:   src/gui/EditMeeting.java
#	modified:   src/gui/EditMembers.java
#	modified:   src/gui/MainScreen.java
#