aktueller Stand 1505

Signed-off-by: ricki1337 <da.rick@gmx.de>
Betreuer hinzugefügt und fehler behoben

Signed-off-by: ricki1337 <da.rick@gmx.de>
Merge branch 'Rick'

Conflicts:
	topcased-workspace/SE-Beleg-Java/src/Controller/StudentListToContract.java
test
Erweiterte Suche
Merge branch 'master' of https://github.com/ricki1337/SeIvJaRi_SE_Praktikumsverwaltung

Conflicts:
	topcased-workspace/SE-Beleg-Java/src/Controller/CompanieList.java
	topcased-workspace/SE-Beleg-Java/src/Controller/ContractList.java
	topcased-workspace/SE-Beleg-Java/src/Controller/StudentList.java
	topcased-workspace/SE-Beleg-Java/src/Models/Datenbank/Database.java
	topcased-workspace/SE-Beleg-Java/src/Praktikumsverwaltung/Praktikumsverwaltung.java
	topcased-workspace/SE-Beleg-Java/src/Views/Dialog/DatabaseConnectionDialog.java
	topcased-workspace/SE-Beleg-Java/src/Views/Import/CopyOfImportWizard.java
	topcased-workspace/SE-Beleg-Java/src/Views/Import/ImportWizard.java