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

* release:
  pick up new ora2 (7/21 -> 8/08)

* rc:
  pick up new ora2 (7/21 -> 8/08)
  make unit tests respect mongo port/host settings (with default)
  Fix json_update_videos()       commit (1f5c95ba) to transcript_utils.py changed the sig of download_youtube_subs     from def download_youtube_subs(youtube_subs, item, settings):     to def download_youtube_subs(youtube_id, video_descriptor, settings):

Fix json_update_videos()

make unit tests respect mongo port/host settings (with default)

settings are read in from environment variable

      commit (1f5c95ba) to transcript_utils.py changed the sig of download_youtube_subs
    from def download_youtube_subs(youtube_subs, item, settings):
    to def download_youtube_subs(youtube_id, video_descriptor, settings):

    hence taking a video id instead of a dict.

    This broke the download captions feature from the utilities page.

from Stanford-Online/release
into Stanford-Online/master

* origin/rc:
  Fix Enroll-email subject containing newline
  Fix Enrollment Email UI/UX
  send beta testers to dashboard
  Remove commented code
  Cleaning up messes from hurried upstream merge
  move stanford logo where tests can find it
  Code additions to enable Ooyala player XBlock.

from Stanford-Online/sjang92/email_subject_bugfix
into Stanford-Online/rc

from Stanford-Online/master
into Stanford-Online/rc

Fix Enrollment Email UI/UX

Fixed enrollment email UI in Studio. The list of changes is as follows:
    - Test Email functionality: can now send yourself a test email from studio
    - Set default template button: can now click a button to replace email
        with the default template
    - UI changes: html ordering and structuring
                  Got rid of enable_default_email button. Pushed this feature
                  to the default template button

Things to note:
    - default template is stanford-specific.
    - minor test changes (since enable_default_email field is gone now)

send beta testers to dashboard

from 'stv/bugfix_bad_merge_conflict_resolutions'
into 'master'

These lines are remnants from debugging during conflict resolution,
following the merge from upstream.

* Restore the temporary use of edx_sga to our CMS advanced components
  list
* Uncomment lines commented out (and then forgotten) during unit test
  debugging

Conflicts:
	cms/djangoapps/contentstore/views/component.py

Fixed duplication of username and full name fields in lms registration

Jbau/rc/fix anon access tests for real

This reverts commit 58089fb0.

lms/djangoapps/courseware/access.py has a complicated return value on line 336
introduced by Jason in January - presumably as part of getting anonymous user
access working. The unit tests in
lms/djangoapps/courseware/tests/test_access.py have changed and this line now
makes the tests (which pass upstream) fail.

Until I understand how to fix it properly, changing this line to always return
True makes the tests pass (though I don't yet understand if it breaks anonymous
user access.)

Some users erroneously set their password as their username with the original layout, because the username field directly followed the password field. Users may be accustomed to the common occurrence of a password confirmation field directly following the password field.
To fix the issue, I did the following:
   - Moved the existing username and real name form fields above the password field.
   - Added a validation in the create_account handler in common/djangoapps/student/views.py, which confirms that the password field does not match the username field.

New tests created to check the added functionality.

Conflicts:
	common/djangoapps/student/tests/test_password_policy.py
	lms/templates/register.html