Datenbank Update + Glasfish Classpath hinzugefügt
DB Update Nachschub
Merge branch 'master' into daniel

Conflicts:
	Sopra/MyDB/log/log.ctrl
	Sopra/MyDB/log/log1.dat
	Sopra/MyDB/log/logmirror.ctrl