zoeken geimplementeerd
Merge remote-tracking branch 'origin/master'

Conflicts:
	webApp/src/main/java/nl/utwente/di/di08/database/DBMv2.java
	webApp/src/main/webapp/PaintingPage.jsp
	webApp/src/main/webapp/WEB-INF/web.xml
	webApp/src/main/webapp/clickedpainting.html
	webApp/src/main/webapp/jsp/clickedpainting.jsp
	webApp/src/main/webapp/old/index.html
	webApp/src/main/webapp/old/styles.css