Split out the recapcha check into separate function.
Added missing test for deleting user with password.
More work towards a password reset.
Added test of setPassword
ResetPassword now uses email as key.
Added recaptcha to password reset form.
Solved some merge conflicts. All green.

Conflicts:
	core/utilities.php
	createUser.php