implement Birdwatcher login as far as it was possible
Merge branch 'master' of https://github.com/Isaisaisa/DB-Merlin
commit to merge
Merge branch 'master' of https://github.com/Isaisaisa/DB-Merlin

Conflicts:
	Aufgabe_3/src/merlin/logic/impl/Merlin.java