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.
Added third password-field
InsertArtworkTest.java finally works.
Merge branch 'test' of https://github.com/utwente-di/di10.git into test
Merge branch 'test'

Conflicts:
	website/src/main/webapp/WEB-INF/web.xml