Conflicts:
	html/class_passwordRecovery.inc
	include/functions.inc
	plugins/personal/generic/class_user.inc
	plugins/personal/password/class_password.inc
	plugins/personal/password/main.inc
	plugins/personal/password/password.tpl