Add fields to users
Merge branch 'user_fields'