Hotfix 2014-04-09

Instead of noting users that are already in a cohort and not changing
such users, clobber the previous cohort and display a message indicating
the previous cohort membership.

JIRA: FOR-452

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)

Update reference to the xblock-mentoring repo for optimized dataexport

Update course_about.html

This reverts commit b4ba04ba.

This reverts commit 1ed167d9.