added whitelist emails
Merge branch 'dev'