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
Add missing lms asset and assign editor only in email mode
Add delay to course email task and use SITE_NAME for site url

 Delay for possible race condition with fetching course email object.
 Use settings.SITE_NAME for host name to generate email footer url.
openended problems now do an ajax call everytime they are loaded
Add retry loop to delegate_email for getting CourseEmail

Revert hardcoded delay for course_email task
Merge branch 'giulio/peer-grading-style-release' into edx-west/release-candidate-20130729

Conflicts:
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
Merge branch 'feature/kluo/bulk-email-squashed' into edx-west/release-candidate-20130729

Conflicts:
	lms/static/sass/base/_variables.scss