personalCollection.jsp added. Will be almost the same code as
Collection.jsp
merge
 bla
subscriptions etc
fixed merge conflict
Merge branch 'collectie'
Merge branch 'search' of https://github.com/utwente-di/di10 into search

Conflicts:
	website/.gitignore
Merge branch 'search'
Merge branch 'admin'

Conflicts:
	website/src/main/java/concordia/kunstverhuur/StandardPage.java
changed change.java redirect after succes
Merge branch 'master' of github.com:utwente-di/di10
tests
Merge branch 'master' of github.com:utwente-di/di10
Merge branch 'master' of github.com:utwente-di/di10 into transactions