fix enrollment issue in instructor dash (ECOM-776)
Preserve the contribution amount specified on the track selection page.
Studio render XBlockAside views
PLAT-280
Make bok_choy tests clean up test files before executing
Do a better job translating "Program Manager"
Add configuration to studio for asides
Merge pull request #6313 from cpennington/bok-choy-clean-mako

Make bok_choy tests clean up test files before executing
Merge pull request #6296 from edx/dhm/studio_asides

make asides render in studio
Merge pull request #6310 from edx/studio-translate-program-manager

Do a better job translating "Program Manager"
Send confirmation email on successful photo submission
Merge pull request #6293 from edx/will/set-donation-amount

Preserve the contribution amount specified on the track selection page.
Add a test of pure xblock and xmodule event publishing
Fix PureSystem so that runtime.publish() works for a pure XBlock.

Fix extracted from https://github.com/edx/edx-platform/pull/6035.
Merge pull request #6311 from edx/renzo/photo-submission-confirmation-email

Send confirmation email on successful photo submission
Merge pull request #6209 from edx/plat/fix-pure-system

Fix PureSystem so that runtime.publish() works for a pure XBlock.
Merge pull request #6231 from edx/adam/fix-unenroll-enroll-inst-dash

fix enrollment issue in instructor dash (ECOM-776)
Track upsell copy interaction, upgrade button and verify now button clicks on the dashboard
Update virtual pageview event categories, general polish