from Stanford-Online:rc
into Stanford-Online:release

from Stanford-Online:master
into Stanford-Online:rc

from stvstnfrd:image-modal/noop
into Stanford-Online:master

Something appears to have changed, with regards to JavaScript loading
via Studio. The function in-question, `setupFullScreenImage`, still
behaves as intended in LMS. However, it fails in Studio despite being
(seemingly?) present in the compiled `cms-modules-xxx.js` file which is
loaded into Studio pages.

This commit defines an in-line NOOP definition of the function, to
ensure that it is always defined in Studio. The feature degrades
gracefully and will now simply render as an image link that leads
directly to the image URL.

Note: LMS is unaffected by both the problem and temporary solution.

This commit must be reverted once we diagnose and resolve the original
issue.

tweak pre and post enrollment email links

This reverts commit e412f55f.

settings are read in from environment variable

Conflicts:
	cms/envs/test.py
	common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py

Fixed bulksettings test for rc

TNL-56

Fixed bulksettings tests to accomodate changes made from upstream to urls.py,
and compute_publish_state function

Conflicts:
	requirements/edx/github.txt

fixes URL of big help modal and fix ORA2 requirements SHA

edX's 2014-08-14 hotfix release pt 2

Conflicts:
	AUTHORS
	cms/djangoapps/contentstore/views/checklist.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/course.py
	cms/djangoapps/models/settings/course_metadata.py
	common/djangoapps/student/tests/test_password_policy.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_draft_modulestore.py
	lms/djangoapps/analytics/basic.py
	lms/envs/common.py
	requirements/edx/base.txt
	requirements/edx/github.txt

Conflicts:
	requirements/edx/base.txt

* Release 2014-08-22, picked up:
** Requirements updates for TrackChanges
** edx-submissions version bump
** help center link is a visible button

* Manually update ORA2 version to the TrackChanges SHA1
** Note this should be reverted when the TrackChanges PR merges upstream
* Includes submissions dependency bump to 0.0.7

This is required following our update to a new version of ORA2.

direct access: exclude non-registered from enrollments

Direct access introduces a bunch of fake course enrollments.  We
don't want to include those in the counts of students enrolled in
the course, nor in the list of students dumped out in the course
roster.

Bump edx-submissions to v0.0.6

This is required following our update to a new version of ORA2.

make help center link a visible button

STUD-1999

STUD-2090

Check REQUEST_CONTEXT.context exists before accessing it.

LMS-11226

Include Optimizely on the platform

Release edx-jsme 1.0

Sarina/annotations fixes