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
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.
fix for prereqs installation cache check
adding prereq installation to js test tasks prereqs
Merge branch 'release'

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py
Merge pull request #3952 from edx/clytwynec/prereqs_installation_update

fix for prereqs installation cache check
Merge pull request #3872 from edx/nick/disable-masking

Temporarily disable masking