If microsites are enabled and it is a microsite request, then take the microsite path for theming
Fix Video Player Pause Issue
Bok-Choy CMS Video Editor Tests
Mark calls to track() on pageload as noninteraction events
Update comments to point to openedx.atlassian.net

And whitespace corrections (automatically made by my editor, and I'm too lazy
to remove them)
Added a relaunch invitation template email
Merge pull request #4865 from edx/ahodges/doc/DOC815

Added a relaunch invitation template email
Rewrite course url matcher to not be greedy
LMS-11181
Make it branch agnostic
LMS-11210

Conflicts:
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
Merge pull request #4878 from edx/dhm/split_branch_agnostic

Make it branch agnostic
Merge pull request #4877 from edx/dhm/course_id_pattern

Rewrite course url matcher to not be greedy
AUTHORS update
Fix messaging for professional ed under auto-registration
Merge pull request #4864 from edx/ammar/fix-pause-state-promise-broken-issue

Fix Video Player Pause Issue
Merge pull request #4875 from edx/db/edx-wiki-to-openedx

Update comments to point to openedx.atlassian.net
add pyfs service
Add tests that verify Studio can still render with bad HTML content.
Add HTTP_RANGE compatibility for ContentStore file streaming

Currently, users can only download ContentStore files from first byte to
last byte.

With this change, when a request to the ContentStore includes the HTTP
"Range" parameter, it is parsed and StaticContentStream will stream the
requested bytes.

This change makes possible to stream video files (.mp4 especially) from
the ContentStore. Users can now seek a specific time in the video
without loading all the file.

This is useful for courses with a limited number of students that
doesn't require a dedicated video server.
Merge pull request #4876 from edx/web-analytics/noninteraction-events

Mark calls to track() on pageload as noninteraction events
Merge pull request #4649 from MarCnu/contentstore-streaming-range

Contentstore streaming range