1 zoekfunctie ipv 3
Merge branch 'master' of https://github.com/DaanPeelman/schildershop.git

Conflicts:
	src/main/java/be/vdab/services/ProductService.java