Sliders!
Merge branch 'master' of https://github.com/DaanPeelman/schildershop.git

Conflicts:
	src/main/java/be/vdab/web/MandjeController.java