Added ENABLE_MKTG_SITE to Features
Added myself to author file
Remove duplicate code in transcripts_ajax.
Added image tags to the whitelist for matlab
Clean up references to answer distribution-like things

In the near future an answer distribution report will be displayed in the data download reports table.  In order to avoid confusion, we need to clean up several misleading labels and remove a redundant feature.

Note that the redundant feature is surrounded by a feature flag so that it can be disabled once the report goes live in the table.

Fixes: AN-694
Merge pull request #2622 from edx/alex/fix_duplicate_code_in_transcripts_ajax

Remove duplicate code in transcripts_ajax.
i18n: Fix typo in studio's email

The right parenthesis should be appeared before the method '.format', not after.
Merge pull request #2972 from mulby/gabe/clarify-answer-dist

Clean up references to answer distribution-like things
Install edx-ora2
Support for displaying submissions API scores in Progress page.
Merge pull request #3051 from louyihua/fix-cms-email-translation

Fix typo in studio's email text
Update translations (autogenerated message)
Concept XBlock prototype
Merge pull request #3037 from edx/will/tim-installation-rebase

Install new ORA (edx-tim)
Merge pull request #3056 from edx/sarina/032514-language-update

Update translations (autogenerated message)
Merge
Merge pull request #3057 from edx/pmitros/concept-xblock-prototype

Concept XBlock prototype

Test environment taking a little longer than expect. Jarv said okay to merge, so merging,
Merge pull request #3032 from IONISx/feature-enable-mktg-site-is-missing

Added ENABLE_MKTG_SITE to Features
Display error page templates, for testing purposes

This commit allows us to test the server error template by visiting `/500`. This
way, we can catch errors in our error templates, instead of having infinitely
recursing errors.
Merge pull request #3060 from edx/db/display-error-pages

Display error page templates, for testing purposes
Fix Studio's XBlock dependency loading issues

STUD-1465

Changed the XBlock rendering logic to use promises to track asynchronous tasks.
Each dependency is then only loaded once the previous one has completed, and the
XBlock initialization only happens once all dependencies are loaded. This gives
XBlocks the same semantics in Studio as they get when shown directly on a page.