Revert "Revert pull request #3466"

This reverts commit 59e3cae4c9c6f2c95a816a8280b470ec6add9486.
Fix for 500 error (undefined) in annotation tool
Using Edx version of tinymce
made is_browser_on_page actually check for the right page in AutoAuthPage
added check for modal to disappear in _change_lang_promise
Autoactivate inactive users on external_auth login

Conditional on existing flag BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH
i18n: Make translation works for video editor tabs

Now the display_name & help strings in video editor tabs can be extracted and translated.
Slight tweak to get_text
Merge pull request #5 from edx/ned/tweak-pr-3730

Slight tweak to get_text
Release Notes for 5/20/14

DOC-401
generate raw URLs that are not rewritten by static_replace
proxy raw further along
Merge pull request #3773 from edx/markhoeber/documentation/doc-401

Release Notes for 5/20/14
Merge pull request #3730 from louyihua/localization-fix-video

i18n: Make translation works for video editor tabs
Merge pull request #1 from edx/db/harvardx

avoid URL rewriting
extend changes of url/raw issue to video annotions
Merge pull request #3782 from edx/jbau/shib-activate-on-acct-linking

Autoactivate inactive users on external_auth login
Merge pull request #3744 from lduarte1991/lduarte-harvardx

Reconnecting Token Generator for Annotation Tool [Fix]
Merge pull request #3762 from edx/clytwynec/bok-choy-auto_auth-page-fix

made is_browser_on_page actually check for the right page in AutoAuthPag...
Merge pull request #3775 from edx/clytwynec/bokchoy-language-test-fix

added check for modal to disappear in _change_lang_promise