Merge pull request #169 from fahadhatib/develop

Develop
Vaildate email addresses in client side javascript
Merge pull request #170 from timschofield/develop

Vaildate email addresses in client side javascript