The correct answer is now correctly displayed after `show answer` is pressed.

Upgrade mock-django in platform & released version for edx-search.

Merge pull request #9447 from edx/ahsan/ECOM-2118-Credit-Eligible-Assessments-Appear-in-Incorrect-Order

Credit-Eligible Assessments Appearing in Incorrect Order

TNL-3136

Upgrading django-simple-history to 1.6.3

Update lettuce to work with Django 1.4 - 1.8

Don't package or optimize assets on devstack

Use the oauth provider utils to ship a generated key/secret

Add role="presentation" to .course-wrapper to prevent table

Add events for tracking when teams are edited.

Remove django-robots from docs/shared/requirements.txt

Remove django-kombu

Remove django-masquerade

Remove django-settings-context-processor

update django-ratelimit-backend

SOL-1171

Fixing spacing in tooltip

Flag test as flaky SOL-1183

Update edx-lint to v0.2.7

passed the display string to the underscore template so that the word "proctored" is not hard coded in the underscore file.

updated the git tag for proctoring repo

Disable the pip version check message

You can still edit this to meet your needs, but you won't need to
manually generate one.

Updated AUTHORS File

use the standard syntax to load JavaScript dependencies on logistrati…

SOL-1159 Remove hash cert asset file name

This message is being shown to people who should not be deciding whether
to upgrade pip, so it is just confusing and alarming noise.

Before:

---> pavelib.prereqs.install_prereqs
---> pavelib.prereqs.install_ruby_prereqs
Ruby prereqs unchanged, skipping...
---> pavelib.prereqs.install_node_prereqs
Node prereqs unchanged, skipping...
---> pavelib.prereqs.install_python_prereqs
pip install -q --exists-action w -r requirements/edx/pre.txt
You are using pip version 6.0.8, however version 7.1.2 is available.
You should consider upgrading via the 'pip install --upgrade pip' command.
pip install -q --exists-action w -r requirements/edx/github.txt
You are using pip version 6.0.8, however version 7.1.2 is available.
You should consider upgrading via the 'pip install --upgrade pip' command.
Could not find a tag or branch '96e1922348bfe6d99201b9512a9ed946c87b7e0b', assuming commit.
Could not find a tag or branch 'b0686a76f1ce3532088c4aee6e76b9abe61cc808', assuming commit.
Could not find a tag or branch '88ec8a011e481918fdc9d2682d4017c835acd8be', assuming commit.

After:

---> pavelib.prereqs.install_prereqs
---> pavelib.prereqs.install_ruby_prereqs
Ruby prereqs unchanged, skipping...
---> pavelib.prereqs.install_node_prereqs
Node prereqs unchanged, skipping...
---> pavelib.prereqs.install_python_prereqs
pip install -q --disable-pip-version-check --exists-action w -r requirements/edx/pre.txt
pip install -q --disable-pip-version-check --exists-action w -r requirements/edx/github.txt
Could not find a tag or branch '96e1922348bfe6d99201b9512a9ed946c87b7e0b', assuming commit.
Could not find a tag or branch 'b0686a76f1ce3532088c4aee6e76b9abe61cc808', assuming commit.
Could not find a tag or branch '88ec8a011e481918fdc9d2682d4017c835acd8be', assuming commit.

TNL-2811

update django-robots

ECOM-2118

PHX-120

ECOM-2044