If microsites are enabled and it is a microsite request, then take the microsite path for theming
Update xblock-mentoring.

Update reference to the xblock-mentoring repository.

A bug where answers containing the string "??" would get mangled by jQuery has been fixed in xblock-mentoring.
Updating ORA2 hash for hotfix August 5th, 2014
ORA2 hotfix 2014-08-06
LMS-11177 Add Split to configuration settings.
LMS-11179 Fix Assets with Split
LMS-11019 Add feature flag to create Split Course
LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL.
Make default_store thread-safe.
Fix get_courses.
Make Split Course work with new Publishing UI.
Address code coverage and quality.
Enforce type of the XBlocks Fields when set

This updates the XBlock dependency to edX/XBlock@***
and add the newly introduced enforce_type methods
Add xmodule fields enforce_type tests
Make enforce_type an optional flag, to avoid conflicts
enforce-type: set the edx/XBlock#200 merge hash
Add my name to AUTHORS
get_items API: have qualifiers be a separate parameter instead of assuming kwargs.
Merge pull request #4720 from edx/split/add-and-fixes

Split/add and fixes
Remove hardcoding of key syntax for base url
and /static and /jump_to_id link substitutions
LMS-11198
Replace create_xmodule with create_xblock
Refactor all callers (often replacing with more appropriate fn)

Also, added for_branch_setting method to old mongo and removed some
branch verification tests

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py