updated form with ME tags
updated email validation
Merge pull request #906 from tonyrd/development

updated form with ME tags