This updates the XBlock dependency to edX/XBlock@cba8d788f0c16802b4cc468ccb6dc765b62e55e8
and add the newly introduced enforce_type methods

make GA account code configurable as well as allow GA to appear on courseware. Also, make the GA account ID configurable rather than hard coded in the Mako template

Conflicts:
	lms/envs/aws.py
	lms/envs/common.py

Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets

- Added hinting/feedback mechanism for multiple choice problem type
- fix styles to make feedback act as an overlay as opposed to a side-by-side block

update hotspot reveal styling

address some PR feedback. Start to build out some Jasmine tests

address PR comments

add some default content

fix when running under https

Updating the hash of the ORA2 release candidate in the requirements

Revert "Open ended panel headings not internationalized."

Fix bad interaction between pluggable InputTypes and Microsites

This reverts commit eb9133ae.

ORA-352

Pluggable InputTypes use edxmako.paths.add_lookup to inject new
mako template directories. Those were getting clobbered by microsites
(and by theming), which were completely rebuilding the mako template
lookup list from scratch.

This commit switches those two features to use the same add_lookup
function as pluggable InputTypes.

[LMS-2489]

Updating ora2 requirements

Converting XModule module to JS.

Add in metric tracking to xqueue.

Part of the process for removing CoffeeScript from
edx-platform dependencies. Covering XModule with JavaScript
Jasmine unit tests.

Added comment to getUserMedia call in photocapture.js

Doc: update xblock publish() function signature

Update captions logic on front-end.

Changed wording for setting up ORA question.

ORA-351

Covers external grading and certificates.

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)