changed short_name to first_name
Merge remote-tracking branch 'upstream/develop' into feature/CLUB-first-name-mail
Merge pull request #1369 from onepercentclub/feature/CLUB-first-name-mail

changed short_name to first_name