Recheck email address for battels before adding manual entry
Merge branch 'master' into staging
Merge branch 'staging' into production