rgrh
Merge branch 'master' of https://github.com/LisaMM/bierhuis.git

Conflicts:
	.classpath
	.gitignore
	.project
	.settings/org.eclipse.wst.common.component
	src/main/java/be/vdab/entities/Soort.java
	src/main/webapp/WEB-INF/JSP/bestellingen/winkelwagen.jsp