added fields to user & validations
Merge branch 'add_phone_number_to_user'