Merge origin/master
small change in update_student_details.php in models/admin