Separated validation into own workspace
Allow direct upload in addition to email
Merge branch 'master' into production