some acceptance tests
fixed merge conflicts
Merge remote-tracking branch 'origin/develop-js' into develop-js-mail
finished #193
refactored mailing logic to fix a logical bug #286