Stand Rick

Signed-off-by: ricki1337 <da.rick@gmx.de>
einarbeitung änderungen sepp

Signed-off-by: ricki1337 <da.rick@gmx.de>
Stand 17.06.
Merge branch 'master' of https://github.com/ricki1337/SeIvJaRi_SE_Praktikumsverwaltung

Conflicts:
	topcased-workspace/SE-Beleg-Java/src/Controller/CompanySingle.java
	topcased-workspace/SE-Beleg-Java/src/Controller/ContactSingle.java
	topcased-workspace/SE-Beleg-Java/src/drucken/PrintExport.java
	topcased-workspace/SE-Beleg-Java/src/drucken/templates/praktika.ftl