deleted hardcoded city field, fixed whitespace
added validation rule for phone field
Merge branch 'user_fields' into dev