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
Cut release candidate

from origin/master
into origin/rc