Remove course ID from title in course about page
add ability for microsites to define additional profile fields to be captured in an overriden signup form - register.html- and then store additional profile in the profile's 'meta' field as JSON blob

fix broken unit test

add some unit tests
Updating release tag for July 14th, 2014
Merge pull request #4415 from edx/cdodge/enhanced_registration_fields

add ability for microsites to define additional profile fields to be cap...
Add defininition of window.location.origin in both CMS/LMS

The same bug in studio was fixed in #3893, and as TinyMCE is also used in LMS, it should be also fixed in LMS.
Here a common javascript file called 'ie_shim.js' is added, so that in the future it can be used for other IE compatibility purposes too.
Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates.

Currently a new temp directory is created for every process via
mkdtemp_clean() which cleans it on process exit.

However, this is not compatible with using --preload option of
gunicorn. With this option the tmp directory is created on gunicorn
start and is shared by all the workers. But when a worker exits it
deletes the directory. And so on the next requent the tmp directory
needs to be recreated and the templates need to be recompiled.

LMS-6507
Revert "Pull out edX into variables in password reset email"

This reverts commit 3a2276b5374fb63b4675ebf627f79b4eaf28c686.
Merge pull request #4428 from edx/sarina/revert-i18n-change

Revert "Pull out edX into variables in password reset email"
Handle bad children pointers during publish
    rather than aborting the publish, ignore them.
    Needed for import
add ability to inspect a cart for the existence of a particular type of item, e.g. PaidCourseRegistration. Only show the 'Shopping Cart' button if there's a PaidCourseRegistration in it.
Merge pull request #4456 from edx/cdodge/shopping-cart-only-paid-registrations

add ability to inspect a cart for the existence of a particular type of ...
make sure the CourseAccessRole Django ORM Admin page uses a raw_id so that we don't populate millions of rows from the production database in the drop down list
adjusted styling of dashboard profile area to remove heavier gradients and other small cleanups
recommender prototype
Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs
Merge pull request #4467 from edx/swli/rc-hotpatch-recommender

hotpatch for recommender (learning science)
Merge pull request #4469 from edx/jbau/dev-environments-disable-ANALYTICS_ACTIVE_COUNT

Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs
Merge pull request #4466 from edx/cdodge/change-course-access-role-admin

make sure the CourseAccessRole Django ORM Admin page uses a raw_id so th...
fix bulk_write context manager.
don't update ancestors while bulk editing.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py