admin user fields fix
users/admin migrations
minor changes to model
migration
migrations
Merge branch 'develop' into staging