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...
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 ...
adjusted styling of dashboard profile area to remove heavier gradients and other small cleanups
recommender prototype
Merge pull request #4467 from edx/swli/rc-hotpatch-recommender

hotpatch for recommender (learning science)
fix bulk_write context manager.
don't update ancestors while bulk editing.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
Merge pull request #4477 from edx/studio/minimal-fix-import-performance

Studio/minimal fix import performance
removed the discount value bug

check error handling if the discount value is not an integer
Merge remote-tracking branch 'origin/release' into rc/2014-07-16

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
Fix unicode issue
resolving merge conflicts
Merge pull request #4179 from IONISx/tusbar/remove-course-id-from-title

Remove course ID from title in course about page