Fix failing acceptance test
Merge pull request #502 from edx/sarina/fix-discussion-acceptance

Fix failing acceptance test
Merge branch 'master' of github.com:edx/edx-platform into feature/kluo/bulk-email-squashed
Add HTML editor for constructing email message adopted from CMS