Javascript User Profile
fixed merging conflicts