Release branch gestart
Merge branch 'devel' into VH12I-A1
Merge branch 'VH12I-A1' of https://github.com/thopstaken/VH12IA into VH12I-A1
Merge branch 'devel' into release
Merge branch 'VH12I-A3' into devel
Merge branch 'devel' into VH12I-A1
Merge branch 'devel' into VH12I-A2
Poging tot fix 2
Merge branch 'VH12I-A1' into devel
Merge branch 'VH12I-A2' into devel
Merge branch 'VH12I-A3' into devel

Conflicts:
	EPD/EPD/src/Control/PatientController.java
Merge branch 'devel' into release
Officiele versie 0.2
Merge branch 'release'
Merge branch 'master' into release
Merge branch 'release' into devel
Merge branch 'devel' into VH12I-A3