Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py

LMS-11354 Make Split has_changes check subtree.

Hotfix/2014 09 05b

Fix Video Transcript Test

Refrain from accessing country code if country is None

Add i18n extraction test

FIX: Studio - System Feedback Icon Styling

escape html for inline discussions (TNL-182)

Cdodge/white label small hotfixes

Tmporarily disable bulk operations b/c old mongo

Revert "Revert "Merge pull request #4976 from edx/will/ecom-128""

This reverts commit 371dfd61.

Christina/cohorts bok choy

change default settings for servers/assets paver tasks from "dev" to "de...

Tooltip Acceptance Test

Release

Corrections to guides for 4 Sep release

Handle the indexerror exception on create_order

TE-460

don't hard code the shoppingcart order confirmation page to use settings.xxx, allow for microsites to override

remove course-id visual column from the list of coupons as it's useless information here and prevents overflows from happening

Items repaired:
- Pin_discussion.png file in wring directory
- Discussion_filters.png image in discussion_students unreadable,
replaced
- updated  release date in Research guide change log
- updated  release date in Course Author’s guide change log
- updated  “History” dates for fields added to research guide

Revert "Merge pull request #4976 from edx/will/ecom-128"

does too much work on exit and doesn't handle nesting

Course Rerun: include stack trace in errors and Log errors.

Fixes to improve help experience& correct HTML build errors

This reverts commit a03baee2, reversing
changes made to 12e2d442.

external_auth: handle request.META values as str, not unicode

Implement forum cohort visibility labels correctly

Release notes draft