Update pillow to 2.6.1
Improved support for multiple organization names

Updates copy used in the checkbox label, constructs strings within the view instead of passing through a separate context variable, and alleviates unipain
don't export draft children of orphaned drafted (TNL-923)
Merge pull request #6184 from edx/adam/dont-export-ophan-draft-children

don't export draft children of orphaned drafted (TNL-923)
3rd-party pipeline supports updating email optin

Fix all the 3rd party auth scenarios.

Update pipeline to preserve parameters.

Updating tests
Merge pull request #6183 from edx/renzo/email-opt-in-copy

Improved support for multiple organization names
Merge pull request #6179 from edx/sanchez/email_optin_third_party

3rd-party pipeline supports updating email optin
update codejail for better logging (TNL-835)
Merge pull request #6185 from edx/adam/update-codejail

update codejail for better logging (TNL-835)
Fix reference error with emailOptIn variable
Merge pull request #6194 from edx/will/ecom-757

ECOM-757: Fix reference error with emailOptIn variable
LMS: removing un-needed utility Sass mixin from calc styling
Merge pull request #6197 from edx/talbs/fix-lms-calculator-toggle

FIX - LMS: removing un-needed utility Sass mixin from calc styling
Upon fail-over check, change asset metadata document to new format.
Merge pull request #6200 from edx/jeskew/fix_500_error_mongo_fmt_change

Upon fail-over check, change asset metadata document to new format.
Fix assert.
Assert mistakenly had comma instead of double-equal - now correct.
Merge pull request #6203 from edx/jeskew/fix_pylint_error

Fix assert.
Limit Upload File Sizes to GridFS.

This commit puts a limit on the size of files that
course staff can upload to MongoDB. The limit is
enforced on the frontend in javascript as well
as backend via the /upload endpoint.

The limit is hard-coded in cms/envs/common.py and
may be changed according to the user's custom
needs.

If the user tries to upload a file that's too
large, an error message will pop up, with a
customizable url that pointing the user to an
external page with an alternate upload procedure.
This url is specified im cms/envs/common.py.
If not set, this url will not be displayed.
Merge branch 'release'

Release 2014-12-10
MA-157 Mobile analytics end-to-end.
Move app-generated context back into properties.
Ignore BI events through segment's webhook.
Ignore events without Data in Properties.