Corrects useredit.phtml (replaces $useredit_website by $user_website)
Merges izend/master