the less horrible merge
Merge branch 'user_profile'