Use Case 2: zoekopdrachten
Merge branch 'master' of https://github.com/DaanPeelman/schildershop.git

Conflicts:
	src/main/resources/resourceBundles/teksten.properties