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 ...
fix shib reg from course about page
removing thread-local cache for branch_setting
recommender prototype
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
Merge pull request #4303 from edx/danielli/recommender_prototype

recommender prototype
Merge pull request #4464 from edx/jbau/remove-branch-setting-cache

removing thread-local cache for branch_setting
always include GA file
Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register

fix shib reg from course about page
Piecemeal conversion to draft needs to allow
already converted children.
STUD-1965
recommender prototype
Merge pull request #4437 from Stanford-Online/giulio/theme-segment-io

always include GA file