Code additions to enable Ooyala player XBlock.
move stanford logo where tests can find it
Merge pull request #89 from Stanford-Online/dcadams/ooyala_xblock

Code additions to enable Ooyala player XBlock.
Merge pull request #93 from Stanford-Online/jbau/fix-asset-for-test

move stanford logo where tests can find it
Merge branch 'release'

Conflicts:
	cms/djangoapps/contentstore/views/component.py
Cleaning up messes from hurried upstream merge

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

These lines are remnants from debugging during conflict resolution,
following the merge from upstream.
Merge PR #98

from 'stv/bugfix_bad_merge_conflict_resolutions'
into 'master'
send beta testers to dashboard
Merge pull request #97 from Stanford-Online/giulio/beta-tester-email-fork

send beta testers to dashboard
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)
Merge pull request #94 from Stanford-Online/sjang92/enrollment_email_fix

Fix Enrollment Email UI/UX
Cut release branch

from Stanford-Online/master
into Stanford-Online/rc
Fix Enroll-email subject containing newline
Merge pull request #103

from Stanford-Online/sjang92/email_subject_bugfix
into Stanford-Online/rc
Release to production

* 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.
Backport release

from Stanford-Online/release
into Stanford-Online/master
Fix json_update_videos()
      commit (1f5c95b) 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.