* HTML in the grade range label was getting passed through to the
  certificate agent via xqueue. This strips HTML before passing labels
  through.

  This change is being rolled into my PR to master for the /request_cert
  endpoint feature.

Changed Lucile Packard Children's CME registration value.

Edited CMS help links with zendesk info

Stanford: Certs merge bug fix

make embargo template theme-able -- Stanford Branch

Use "Stanford-style" theming to enable you to put your own embargo
notice up.

The main conflicts were in the presentation.  It seems that we're going
from sections to divs, fine.  But a few material conflicts with changes
in our long-lived branch that we're still carrying around.

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/tests/test_date_utils.py
	common/lib/xmodule/xmodule/util/date_utils.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/courseware/tabs.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/envs/test.py
	lms/static/sass/multicourse/_home.scss
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/courseware/accordion.html
	lms/templates/courseware/course_about.html
	lms/templates/courseware/courseware.html
	lms/templates/courseware/progress.html
	lms/templates/main.html
	lms/templates/main_django.html
	lms/templates/problem.html
	lms/templates/register.html
	lms/templates/registration/password_reset_complete.html

Fix case where both old and new transcripts are uploaded, but transcript language isn't one of the new transcripts.

[BLD-889]

ORA-330

Finalize tests for embargo middleware app

Allows specification of countries to embargo, what course(s) should
apply embargo restrictions, and whitelist/blacklist capability for
specific individual IP addresses.

Adds configurable middleware in common/djangoapps/embargo that
allows specific courses to comply with US Export regulations by
embargoing students from specific countries, whilst simultaneously
allowing other courses to be freely open to all.

This bug affects the case of more than one multiplechoice
all in one problem.
Also adding a test case for this form.

Update translations (autogenerated message)

Updated course introduction video section

add i18n scraping to tabs.py (LMS-2166)

updates for stud-1214

minor change to html in announcement unit (STUD-1334)

Bump up the verbosity on bok-choy logging

add dummy strings

Video: allow multiple transcripts

New Images

adding edx-private requirements file to add jsdraw

Markhoeber/documentation/imf issues

DOC-60

For STUD-1303

UI for Draft components changes

Dbarch/parse course