got rid of ajax calls from EditProfile.php, replaced with php
fixing merge conflicts