Merge remote-tracking branch 'origin/Elizabeth'

Conflicts:
	protected/components/UserIdentity.php