Update user/editmahara.php with changes from user/edit.php