Opaque-keys: fix pep8 violations
Opaque-keys: fix pylint violations
StaffFactories accept `course_key`s, not `course`s. Make that clear in the interface.
Fixed some TODOs, removed irrelevant ones
Add Oriya language
Add Gujarati language
Update translations (autogenerated message)
Merge pull request #3884 from edx/sarina/052714-translations

Update translations
Merge pull request #3874 from edx/sarina/opaque-keys-cleanup

Sarina/opaque keys cleanup
Merge pull request #3888 from edx/dhm/bug_get_children

Redirect most studio access through draft modulestore
i18n: Make .underscore files translatable

Currently the strings in .underscore files are not extracted
by i18n/extract.py, which causes most strings in such files
are not translatable. As there is no existing tools which can
extract messages from these files, a simple shell command is
written to do such job.
Make reverse matching robust to errored courses

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
Don't access course.id on ErrorDescriptors when listing courses from mongo
get_courses doesn't return ErrorDescriptor
lms dashboard ignores errored courses
Temporarily disable capa name masking

There is a bug I need to fix when a student re-visits a problem that they
had solved previously without masking enabled, their old state does not
load correclty.

It's simplest to turn off masking now, and re-enable it with the whole fix.

The change here is a small deletion to remove the masking=True logic, and more
lengthy changes to adjust the tests.
load js without specifying protocol
Bok-Choy Video Tests Batch9
BLD-1060: Fix RelativeTime.
Diacritic Plugin for Annotator TooL: Added CSS and JS files

- UI Fixes for Diacritic Mark Plugin