#951048 by EclipseGc: Tighter entity integration so that new entities are automatic contexts and relationships.

#991658 by burlap: Fully load the "user" context for the logged in user because not all fields are in $user.

     Conflicts:
         CHANGELOG.txt
         css/modal.css
         ctools.module
         ctools_plugin_example/plugins/access/arg_length.inc
         ctools_plugin_example/plugins/access/example_role.inc
         help/export.html
         includes/ajax.inc
         includes/cleanstring.inc
         includes/content.inc
         includes/content.menu.inc
         includes/context-task-handler.inc
         includes/context.inc
         includes/context.theme.inc
         includes/css.inc
         includes/export.inc
         includes/modal.inc
         includes/object-cache.inc
         includes/plugins.inc
         includes/wizard.inc
         js/ajax-responder.js
         js/collapsible-div.js
         js/dependent.js
         js/dimensions.js
         js/mc.js
         js/modal.js
         page_manager/page_manager.admin.inc
         page_manager/page_manager.module
         page_manager/plugins/tasks/page.inc
         page_manager/plugins/tasks/search.inc
         page_manager/plugins/tasks/user_view.inc
         plugins/access/context_exists.inc
         plugins/access/node_language.inc
         plugins/access/perm.inc
         plugins/access/php.inc
         plugins/access/role.inc
         plugins/access/site_language.inc
         plugins/access/term.inc
         plugins/access/term_vocabulary.inc
         plugins/content_types/block/block.inc
         plugins/content_types/custom/custom.inc
         plugins/content_types/node/node.inc
         plugins/content_types/node_context/node_comment_form.inc
         plugins/content_types/node_context/node_comments.inc
         plugins/content_types/node_context/node_content.inc
         plugins/content_types/page/page_breadcrumb.inc
         plugins/content_types/page/page_footer_message.inc
         plugins/content_types/page/page_help.inc
         plugins/content_types/page/page_messages.inc
         plugins/content_types/page/page_mission.inc
         plugins/content_types/page/page_slogan.inc
         plugins/content_types/page/page_tabs.inc
         plugins/content_types/page/page_title.inc
         plugins/content_types/search/search_result.inc
         plugins/contexts/node_edit_form.inc
         plugins/contexts/term.inc
         plugins/contexts/terms.inc
         plugins/contexts/user.inc
         plugins/relationships/book_parent.inc
         views_content/plugins/content_types/views.inc
         views_content/plugins/content_types/views_panes.inc
         views_content/views_content.module

forward with the 7.x port!

Committing in a collection of ongoing port work from #589636, so that we can stop trying to track it all in patches.

Will make merging in changes (with an outside dvcs) from the 6--1 branch easier, anyway.

First steps toward updating CTools to d7. This contains some stuff found by coder module, plus css.inc should be fully ported. No testing performed though, so theres probably bugs. Need to write some tests or something.

#447920: Ensure there is a context selector for the "terms" argument and context converters so it can be used with Views.

#416298: Provide a mechanism so modules such as Hierarchical Select can cooperate with delegator form overriding.

Allow restricting contexts via access control to allow the add content UI to remove irrelevant content.

Expand the context to allow the plumbing for replacing placeholder contexts with real contexts for preview.

Implement context keywords which also use the converters. Add converters to user, fix taxonomy converters.