Uncomment thumbnail tests
Decorate test functions that require Pillow JPEG support
actually look for an image to verify that a thumbnail has been generated
fix enrollment issue in instructor dash (ECOM-776)
fix git_export tests
fix pep8 violation
Merge pull request #6239 from edx/clytwynec/fix_pep8_violation

fix pep8 violation
Merge pull request #6238 from edx/clytwynec/fix_failing_git_export_tests

fix git_export tests
Make a generic django field for storing OpaqueKey classes
Extract common base functionality for storing xblock fields in the relation db
Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database backed configuration to it
Add a configuration model for managing XBlockAsides
Mock out the underlying segment-io call.

TE-532
Teach LMS how to render XBlockAsides

[PLAT-217]
Make ErrorDescriptor more resistent to errors
Merge pull request #6162 from cpennington/xblock-asides

XBlockAsides in LMS
Fix another analytics.init secret error message (noise).
Pipe analytics client output to stdout instead of devnull.
change the context_processor in the shopping cart to return a pointer to a function so that only the templates that actually need to know if the shopping cart button should be shown will actually make the database roundtrips
Merge pull request #6242 from edx/cdodge/move-shoppingcart-button-detection

change the context_processor in the shopping cart to return a pointer to...