small changes
Merge remote-tracking branch 'origin/kit' into kit

Conflicts:
	registration.php