Update django-nose version
for tests change the default xml data dir to a place where it will get cleaned up
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
Studio render XBlockAside views
PLAT-280
WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased
Split payment/verification business intelligence analytics

Track verify now and verify later choices, image captures, image retake, and name changes, as well as virtual pageviews for every step in the new flow(s).
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.
Merge pull request #6294 from edx/renzo/split-verification-analytics

Split payment/verification business intelligence analytics
Merge pull request #6292 from edx/zoldak/default-xml-test-dir

for tests change the default xml data dir
Updating the design of the DRF views for enrollments.

Consolidate PUT and POST on the RESTful Layer.

Change URLs for API

Test cleanup.

Adding a course details URL to the enrollment API.

Change student to user

Change to v1, remove feature flag from API URLs

Updating student to user in tests

Re-ordering redirect urls to be evaluated last.

Adding pagination and testing.

Adding Django REST settings for pagination.

Revert "Re-ordering redirect urls to be evaluated last."

This reverts commit 4c9502daa383e49b46f8abec5456c271e5e24ccb.

Re-ordering redirect urls to be evaluated last.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding Django REST settings for pagination."

This reverts commit 9f8a54c41f34caa24818c88f1e75ac59f6ce5259.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding pagination and testing."

This reverts commit 0b2d46262abb78f5ad170700205e7fd28b6af942.

Additional testing, logging, and error messages.
Merge pull request #6216 from edx/sanchez/cleanup-restful-layer

Enrollment API Cleanup
Quiet analytics.init stderr output for tests.
Make bok_choy tests clean up test files before executing
Do a better job translating "Program Manager"
Merge pull request #6307 from edx/benp/clean-analytics-init

Quiet analytics.init stderr output for tests.
Add configuration to studio for asides