added email and username validation
Merge branch 'develop' into staging
validation of email and usernames