Email Validation DONE
Merge branch 'develop' into webqa