collectietest-fix
Merge branch 'master' of github.com:utwente-di/di10 into admin
removed printlns
Images fixes en toevoeging Subscriptions nu required voor huren of reserveren
Merge branch 'transactions'
Merge branch 'services'

Conflicts:
	website/src/main/java/concordia/kunstverhuur/Huren.java
	website/src/main/java/concordia/kunstverhuur/Login.java
	website/src/main/java/concordia/kunstverhuur/Search.java
links
merge