Add course image support to email template
Merge branch 'feature/kluo/bulk-email-squashed' of github.com:edx/edx-platform into feature/kluo/bulk-email-squashed