Add ability to deactivate GA snippet
Merge pull request #3606 from edx/renzo/no-ga

Add ability to deactivate GA snippet
removing larger size for CodeMirror for funky visual behavior on Checkbox problems in release
Fixed simple editor text showing in advanced editor.
Remove (Grade Me!) template until it can be productized.
Merge pull request #3611 from edx/frances/fix/codemirror-overflow-checkboxes2

Fix for Codemirror overflowing Multiple Choice modal
Merge pull request #3614 from edx/waheed/fix-simple-problem-editor

Fixed simple problem editor text showing up in advanced editor
Merge pull request #3616 from edx/christina/remove-template

Christina/remove template
add quotation mark to _dashboard_course_listing.html
Merge pull request #3620 from edx/adam-add-quotation-mark

Adam add quotation mark
Show same thing on dash for audit and honor code students.
Merge pull request #3627 from edx/diana/fix-audit-cert

Fix audit certificate display
Fix dashboard template around final grade status

* ae8847cd6e73 checked in buggy conditional in the dashboard templates
  that caused an empty 'details being wrapped up' box to display
  regardless of whether it was true.
* Simplify conditional so that we care only whether output of the view's
  _cert_info() says 'processing', which should be the value computed when
  either no cert status exists or when the certs are, in fact processing.

  This should mean that the "details being wrapped up" message is
  displayed when certs haven't run and the grade box is displayed the
  rest of the time.
Merge pull request #3629 from edx/jrbl/oops-fix-dashboard-template

Fix dashboard template around final grade status
Disable a flaky ORA Javascript test.
Merge pull request #3636 from edx/diana/disable-flaky-js-test

Disable flaky Javascript test
BLD-1057: Fix Video player in FF.
Merge pull request #3671 from edx/adam/rebase/anton-fix-video-in-ff

BLD-1057: Fix Video player in FF.
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 branch 'master' into release

Conflicts:
	cms/static/js/views/modals/edit_xblock.js