Added Celery support to send mass emails
Merge remote-tracking branch 'origin/master'