Add user profiles.
Merge branch 'master' into user_profiles
Allow either username or email address in looking up a user profile.
Merge branch 'master' into user_profiles
Merge branch 'user_profiles'