switch the notification to be a prompt and allow for the user to go to the edit unit page which contains the module in error. Otherwise, present the raw exception message and allow user to go to the course outline page.

Conflicts:

	common/lib/xmodule/xmodule/raw_module.py

Fixups to Nate's anonymized id mapper, repairing pep8 and pylint errors,
and rebasing on recent master.

So that instructors have easy access to the mapping from anonymized
IDs (a simple MD5 hash of the user ID that's used when integrating
with third-party services like Qualtrics) to user IDs, we have a
simple Django management command to generate a CSV mapping. To run,
use the following:

rake django-admin[anonymized_id_mapping,<system>,<env>,<course_id>]

And, of course, substitute the appropriate values for <system>, <env>,
and <course_id>. (E.g., lms, dev, and MITx/6.002x/Circuits)

Merge branch 'jinpa/check-off-edx-west-release' of github.com:edx/edx-platform into edx-west/release-candidate-20130806

Merge branch 'giulio/peer-grading-style-release' of github.com:edx/edx-platform into edx-west/release-candidate-20130806

Conflicts:
	common/lib/capa/capa/templates/choicegroup.html

We have found that users were getting confued by the buttons named
"check," and on their last allowed attempt, "final check."  Check looks
implies something for the user only, not a real problem submission.

So this changes the wording to "Submit" for most attempts, and "Final
Submit" for the last attempt allowed.

We (Stanford) had made a prior change to only say "Submit" on the final
attempt, but condisering that now that seems even more confusing.

Per @jinpa:
> Looking again now at the wording in 6eb78cc I'm worried that "saved
> by not graded" doesn't make crystal clear that they haven't been
> _submitted_.  Given that we're not auto-submitting at the deadline
> (someday let's add that feature), can we change the wording to:
> "Your answers have been saved but not submitted. Click 'Submit'
> when you're ready."

changing message that shows when users go forward and back from openended and fix save reload message

changing message that shows when users go forward and back from openended and fix save reload message

Merge branch 'giulio/peer-grading-style-release' of github.com:edx/edx-platform into edx-west/release-candidate-20130729

Merge branch 'giulio/peer-grading-style-release' of github.com:edx/edx-platform into edx-west/release-candidate-20130729

As documented in Jira LMS-806:

Steps to reproduce:
* as one user, for a peer evaluated problem, enter something that needs
  peer grading
* as another user, log in and fire up the peer grading panel. You should
  see something that needs attention, a yellow exclamation badge
* clicking on the "do grading" panel will fail with a 500, stacktrace
  attached.
* it's possible that the question where this is being done must first have
  professor calibration done in order for peers to be able to actually get
  work to grade.

Don Mitchell debugged this with me and saw some problems in the ways
that the peer_evaluation xmodule code was accessing dates. Instead of
using the normal lms accessors, by going straight into the _module_data
it would be bypassing some important code (caching?). Fixing this to be
more standard did the trick.

Conflicts:
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee

 Remove username from email footer.

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

Conflicts:
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee

Revert hardcoded delay for course_email task

 Delay for possible race condition with fetching course email object.
 Use settings.SITE_NAME for host name to generate email footer url.

 Delay for possible race condition with fetching course email object.
 Use settings.SITE_NAME for host name to generate email footer url.

Merge remote-tracking branch 'origin/feature/kluo/bulk-email-squashed' into edx-west/release-candidate-20130729

Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/djangoapps/courseware/views.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/courseware/courseware.html