Anamnese
Merge branch 'devel' into VH12I-A3
Merge branch 'VH12I-A3' of https://github.com/thopstaken/VH12IA into VH12I-A3
Fixes van bugs die door de merge ontstaan zijn

Fixes van bugs die door de merge ontstaan zijn
Merge branch 'VH12I-A3' into devel
Merge branch 'devel' into VH12I-A1

Conflicts:
	EPD/EPD/src/Entity/DataBaseimplementation.java
Merge branch 'VH12I-A1' of https://github.com/thopstaken/VH12IA into VH12I-A1