Skip intermittently failing video test

make only section name in headers editable

STUD-1679

Fix some translation tags

Ahodges/documentation/doc502

Improve handling of bad JSON from comments service

load js without specifying protocol

ORA2 AI Grading Settings

Instead of allowing the JSONDecodeError to escape, raise an error
indicating the request id and containing the first 100 characters
of the response to aid investigation.

Added prototype DoneXBlock and AudioXBlock

Allow consumption of environment variables in docs Makefiles

Added ORA2_FILE_PREFIX setting

Author/owner of change is Ned. Committer/typer is Piotr.

Skip intermittently failing bok-choy video seek test

See: https://bitbucket.org/birkenfeld/sphinx/issue/1368/makefile-options-not-overridable-from

Removed excessive logging

Update EASE version (includes base reqs)

adds user id to student profile information (LMS-2791)

Temporarily disable masking

fix for prereqs installation cache check

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

Adds Ben McMorran to authors file.

Check YouTube for Bok-Choy

Lettuce YouTube Check Improvements

ORA2 release-2014-06-02T15.45

RelativeTime: incorrect value after XML serialization.