Use case 2: zoeken
voor test
Merge branch 'master' of https://github.com/DaanPeelman/schildershop.git

Conflicts:
	src/main/java/be/vdab/dao/ProductDAO.java
	src/main/java/be/vdab/services/ProductService.java
	src/main/java/be/vdab/services/ProductServiceImpl.java
	src/main/java/be/vdab/web/ProductController.java
	src/main/resources/resourceBundles/teksten.properties
	src/main/webapp/WEB-INF/JSP/producten/producten.jsp