edx/edx-platform — pull request #2657 by cahrens (2014-02-20 15:43:20+00:00)
Title: Christina/tinymce upgrade

This contains the commits in #2588. The older PR was built off of a version of master in which Studio was broken (django debug toolbar), so I needed to create a new branch to resolve that issue.

Also, it looks like we will need to make additional code changes to get back the same toolbar functionality that we had previously.