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
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