added admin emails
merge
Merge branch 'reg19'