Cleanup some xmodule tests imports and data directory location
The enrollment_action value enroll should not be translated.
enable instructor dashboard in lms/envs/dev
fix password reset templates
put wiki templates back into Django templating
add settings.PLATFORM_NAME to password_reset_confirm context
add PLATFORM_NAME and BUGS_EMAIL to cms/envs/common
replace html strings wtih tokens in templates
adding django-admin commands to dump grades to a csv file
Add mgmt cmd to generate anonymized ID mapping

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)
Anonymized ID mapping fixups

Fixups to Nate's anonymized id mapper, repairing pep8 and pylint errors,
and rebasing on recent master.
Merge pull request #660 from edx/feature/msteele/enable-dev

Enable instructor dashboard in lms/envs/dev
added video changes to the changelog
if mktg, redirects faq to mktg. else, to '/help'
fix syntax error in help_modal
add dummy FEEDBACK_SUBMISSION_EMAIL for debugging
Merge pull request #668 from edx/fix/adam/lms-help-button

Fix/adam/lms help button
Merge pull request #663 from edx/nate/anonymized_id_mapping

Add mgmt cmd to generate anonymized ID mapping
Merge branch 'release'
Merge pull request #669 from edx/zoldak/release-changelog

added video changes to the changelog