Handle Unicode for Incoming Keys
Do not install requirements from github.txt in editable mode
Handle unicode through try catch
WL-163-added-the-USD-symbol-himBHin-the-HTML-templates-configuration-settings

added the unit tests for the default currency settings
Update AWS Configuration for ORA1 Problem Creation
Merge pull request #6068 from edx/muhhshoaib/WL-163

The USD symbol $ is hard coded into the HTML templates
fix blank lines
fix broken master regarding pep8 number of blank lines
Merge pull request #6089 from edx/cdodge/pep8-fixes

fix broken master regarding pep8 number of blank lines
Merge branch 'master' of github.com:edx/edx-platform
In microsites, don't redirect logged in users with enrollments to dashboard
Merge pull request #6088 from edx/cdodge/no-redirect-to-dashboard

In microsites, don't redirect logged in users with enrollments to dashbo...
Merge pull request #6038 from edx/zoldak/not-editable-mode

Do not install requirements from github.txt in editable mode
Prep marketing iframe and relevant courseware view for email opt-in

Feature flagged. Puts a checkbox in the iframe. The iframe uses an organization_full_name parameter forwarded from Drupal by the courseware views and POSTs an email_opt_in parameter to the student views, preserving it on 403.
s/pylint: disable=W0621/pylint: disable=redefined-outer-name/
s/pylint: disable=C0111/pylint: disable=missing-docstring/
s/pylint: disable=E0611/pylint: disable=no-name-in-module/
s/pylint: disable=C0103/pylint: disable=invalid-name/
Remove outdated pylint disable
s/pylint: disable=E1101/pylint: disable=no-member/