Merge branch 'master' into test

Conflicts:
	website/src/main/webapp/WEB-INF/web.xml
Merge branch 'admin' into test
profiel.jsp updated to help Axel.
Uploaded meetings (thanks Yorick)
Added third password-field
InsertArtworkTest.java finally works.
Merge branch 'test' of https://github.com/utwente-di/di10.git into test
Merge branch 'admin'
Merge branch 'test'

Conflicts:
	website/src/main/webapp/WEB-INF/web.xml
Huren.java
Updated Login.java, StandardPage.java and web.xml
merge
Web.xml now works
UpdateEmail, UpdatePassword updated
Suggestions.java
various stuff
more various stuff
Updated all StandardPage.java references
idk
collectietest-fix