Extended user profiles
Merge branch 'extended_profile'