Changed email validation to php native filter_var since dots were not allowed
Merge branch 'email_validation' into develop