merged upstream, changed user.js to user_profile.js