Fix failing tests from merge with master
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html
Release for May 12, 2014
Fix merge conflicts relative to master
Migration refactoring
Let sql tell us if the data is unique
fixup! Migration refactoring
Merge pull request #3675 from edx/opaque-keys-migrate

Opaque keys migrate
Fix @feanil Traceback from Logs(TypeError: 'SlashSeparatedCourseKey' object is not iterable)
Merge pull request #3600 from edx/rc/2014-05-06

Release Candidate cut May 6th, 2014, finally made it to release branch on the following Monday (May 12th)
Merge pull request #3684 from edx/ora2/release-2014-05-12T12.57

Release for May 12, 2014
Only show banner on legacy dash for edx.org

LMS-1296
Merge pull request #2865 from edx/sarina/change-default-dashboard

WIP Switch default instructor dashboard to new dash
Corrected test names and doc strings
Allow extra fields returned from comments service

Previously, an error was raised if the comments service returned data
including an unexpected field, which unnecessarily complicated the
release path for new features, since the list of allowed fields would
need to be modified before cs_comments_service could be modified, and
only then could edx-platform take advantage of the new CS feature. We
still log a warning if an unexpected field is returned, so we will
still be able to tell if the CS returns a corrupt response.

JIRA: FOR-180
Merge pull request #3601 from edx/markhoeber/documentation/doc-331

Release Notes for 5-6-14
Release notes date fix
Merge pull request #3686 from edx/markhoeber/documentation/release-notes-date-fix

Release notes date fix
Pass deprecated course keys through
Merge pull request #3647 from edx/gprice/comment-client-allow-extra-fields

Allow extra fields returned from comments service