Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts

'force_publish' command for publishing a course forcefully by making …

Weekly release for 2015-10-01

Fix displaying wrong membership on "My Team" view.

The heart of this fix is to change the "My Team" view to use a
collection of teams instead of memberships. The team card is
refactored to only take a team, rather than attempt to be polymorphic
over teams and team memberships. This change enabled removing a good
amount of old code. This also requires adding a `username` parameter
to the teams list endpoint which allows getting a list of all teams
for a single user, in order to allow refreshing the "My Teams" view
correctly. Currently this list is of length at most one.

TNL-3410

Flag test as flaky.

Add node_modules to the path via the jenkins-common script instead of…

SOL-1247: use overridden course number and org

SOL-1225: Pressing tab button does not takes user to next field

renamed test's name

'force_publish' command for publishing  a course forcefully by making the published branch point to the same structure as the draft branch. add force_publish functionality to split courses.

DRF uses query_params instead of QUERY_PARAMS.

Messaging and text improvements dashboard

ECOM-2338

Add myself to AUTHORS

This reverts commit 3849a8fa.

fix typo in course_info.html

The jenkins-common script is the better place for this particular setup, since that
script is doing similar setup steps to prepare the environment for running
various tests/subsequent scripts. This also will resolve downstream processes,
such as our jenkins AMI builder (for jenkins-worker images).

asadiqbal08/MAYN-116 Including GTM code from microsite

ziafazal/SOL-1185: move SOCIAL_SHARING_SETTINGS out of FEATURES

Make the message to the end user consistent across as requirement typ…

update reference to edx-proctoring to account for requested iconograp…

Depends on functionality that has been temporarily reverted

There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.

Remove the edx.org comprehensive theme

TNL-3442

Depends on functionality that has been temporarily reverted

Upgrade django-filter.

Update bok-choy version to v0.4.5

There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.

Reserve ecommerce service username on edx-platform.

update reference to edx-proctoring to account for requested iconography changes from UX team. Also update test to conform with changes

i18n course browse copy