Changed wording for setting up ORA question.

ORA-351

Watch for asset changes.

Adam/merge release to master

Added note about pages being publicly viewable

Conflicts:
	requirements/edx/edx-private.txt

Upgrade JSdraw input.

Translation fix in studio: For better translation in unit.html

Make paver respect NO_PREREQ_INSTALL

As the sentence in unit.html is splitted into three parts due to the varible release_date may be None, it breaks the integrity of a sentence.
Different language may have different word or event grammer order, so if a sentence is breaked into three parts, translators cannot adjust the word orders to create a good translation.
So this fix tries to combine the sentence together.

Fix the chinese name of chinese language in common.py

Update translations (autogenerated message)

Update reference to the xblock-mentoring repo for optimized dataexport

Update course_about.html

This reverts commit b4ba04ba.

This reverts commit 1ed167d9.

Alex/multiple transcripts editor

Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.

Ahodges/documentation/answerdist

STUD-1488

Update Translation documentation

Add acceptance test for blocked YouTueb API with HTML5 sources

raise ItemNotFoundError if course not found in modulestore (course_listing) 

When the video has both YouTube IDs and HTML5 sources, and
the YouTube API is blocked, then HTML5 sources should be
used.

Fixed legacy dash numeric placeholders with named.

STUD-1455

Internationalized open ended panel headings.

LMS-2169

Conflicts:
	lms/djangoapps/courseware/features/video.feature

Valera/fix multiple videos on page release