tests en uitgelicht kunstwerk
Merge branch 'master' of https://github.com/utwente-di/di09

Conflicts:
	design/JavaProject/Concordia/src/main/java/project/content/advies/AdviesTOVHistorieAndereKlanten.java
Merge branch 'master' of https://github.com/utwente-di/di09