Fixed password reset message

'ignore' shouldn't be use for ascii conversion

The input string is not expected to contain any unicode characters

Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements.

The forcing of IDs to non-draft must happen in base.py instead of draft....

fixes issue where STATIC_URL was overwritten without git.revision

The draft.py solution only worked when the parent was also in the draft store.

fixes this commit - https://github.com/edx/edx-platform/commit/5ec77010e3bc0303cdb06ebf32e806936fd36ce6

298.15 K is 25 C, not 0 (0 is defined to be at 273.15)

#os

Review all panel help text in Studio UI for Studio-924

Change dummy locale to Esperanto

merge 2013-11-15 hotfix branch to master

Reviewed and updated all on-page panel help text in Studio for clarity,
consistency, and brevity.  Updated template HTML files to change text

STUD-924

Declare PYTHONPATH in i18n:test rake task

Alert users when forum AJAX requests fail 

AJAX requests on forums pages occasionally fail (usually when a request
to the comments service times out), but the user is not made aware of
the failure. This manifests as either the system not appearing to store
state (e.g. if an attempt to flag a post fails) or something taking
forever to load. Now, a modal will pop up to alert the user that a
request has failed and instruct them to reload the page.

In the longer term, we should fix each user gesture that results in an
AJAX call to gracefully handle a failure by resetting the state of the
world appropriately and aleritng the user.

JIRA: FOR-37

Flowerhack/feature/refactor to track enrollment

Video player: fix acceptance test.

Signed-off-by:  <manuel.freire@fdi.ucm.es>

LMS: add CSRF token to register form

Add template for checkboxes to studio.

LMS-1507

Stop video skipping links from showing up when not needed and address the issue of skip links for multiple videos.

adding override for GITHUB_REPO_ROOT

allow override for STATIC_URL

This is the base directory for course data