wachtwoord wijzigen
Merge remote-tracking branch 'origin/master'

Conflicts:
	werkende versie workspace/flatportal-final/src/main/webapp/error.jsp
Merge branch 'master' of https://github.com/utwente-di/di02