admin settings slogan fix
check for unique email
Controller: trace, don't warn in saveModelAndHistory() on model validation failure
fix password handling. Document User model scenarios.

Conflicts:
	civi-php/protected/models/User.php