Update django-nose version
Make XmlModuleStore handle asides
PLAT-221
Merge pull request #6288 from edx/zoldak/update-django-nose

Update django-nose version
Merge pull request #6202 from edx/dhm/xmlms_asides

Make XmlModuleStore handle asides
WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased
Merge pull request #6234 from edx/afzaledx/WL-172-order-history

WL-172 Show a Order History list on the Student Dashboard for any PaidCo...
Fixed CodeMirror editor view height in studio.
TNL-920
Merge pull request #6192 from edx/waheed/tnl920-fix-code-mirror-editor-view-height

Fixed CodeMirror editor view height in studio.
Creative Commons Licensing for edX LMS and Studio
Fixes to CC License serializer for Course descriptor
Fix faulty license field conversion
Update licensing to use json
Fixed frontend to work with json and diplay license if it exists, independent of licenseable
Fix for JS license selector
Refactor license selector
Fixes license setter for courses + view logic in about and navigation
Code refactoring
CC Licensing fixes according to edX design for Studio
Code refactoring
Code review fixes + fix for licensing of videos with captions