Added server-side validation of email.
Merge branch 'develop' into staging