minor fix
Merge branch 'master' of ssh://git@github.com/Gruppe01/EXPHIL03.git
Merge branch 'master' of ssh://git@github.com/Gruppe01/EXPHIL03.git
Merge branch 'master' of ssh://git@github.com/Gruppe01/EXPHIL03.git
minor fix
minor fix
minor fix
Fixed login
Merge branch 'persistence-updatehandler' of https://github.com/Gruppe01/EXPHIL03

Conflicts:
	src/gui/Frame.java
Merge branch 'master' into CreateM
Fixed login
Removed remove meeting from schedule button.
Merge pull request #65 from Gruppe01/gui-weekcalendar

Removed remove meeting from schedule button.
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03 into gui-Mainscreen
create meeting done
Merge pull request #66 from Gruppe01/CreateM

Create meeting done
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03 into gui-Mainscreen
Client is now private
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03 into gui-Mainscreen
minor bug fix