Merge branch 'admin'
highlighting reserved artworks
started on service list customerside
geschiedenis, need purchase implementation
better page, all functions except cancelling and extending supported
Fix voor: detailpagina's niet op te halen als artwork is gereserveerd met ophalen via kunstwerk.jsp
Merge branch 'admin' of github.com:utwente-di/di10 into admin
Merge branch 'test'
probably finished it... hopefully... mostly... somewhat...
Dat merging
Merge branch 'services'

Conflicts:
	website/src/main/java/concordia/kunstverhuur/DeleteArtwork.java
	website/src/main/java/concordia/kunstverhuur/Huren.java
	website/src/main/java/concordia/kunstverhuur/Services.java
	website/src/main/webapp/admin.jsp
bla
idrk
Merge branch 'services' of github.com:utwente-di/di10 into services
Implemented prepared statements and properly closed connections without spawning errors to the ocnsole
Merge branch 'images'
changed kunstwerk.jsp code layout & added logs of stuff
corrected renting time
added reservation/rent functionality
started purchase servlet