Documentation collision detection
Merge branch 'development' of https://github.com/olafmaas/contextprojectgroep6.git into development