Added ENABLE_MKTG_SITE to Features
Added myself to author file
remove course location from loc_mapper on delete
Remove duplicate code in transcripts_ajax.
fix typo in data download tab (LMS-2441)
Merge pull request #3041 from edx/adam/fix-data-download

fix typo in data download tab (LMS-2441)
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
Added image tags to the whitelist for matlab
Merge pull request #2985 from edx/zub/story/deletecoursefromlocmapper

remove course location from loc_mapper on delete
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