Competenties > wijzigen/zoeken
Merge origin/develop into develop

Conflicts:
	src/java/controller/ProfileController.java