getting the latest changes
git status
getting the latest from master

Merge branch 'master' into review-overlap-bug
fixed the display of the email field in iPhone