Update
Merge branch 'master' of https://github.com/timartesis/codeandballs

Conflicts:
	Examenmonitor/RegistratieForm.aspx
	Examenmonitor/WachtwoordVergeten.aspx