Merge origin/master

Conflicts:
	src/java/be/thomasmore/service/GegevensStudentOphalenService.java
	src/java/be/thomasmore/service/GegevensStudentOphalenServiceImp.java