#869766: Fix occasional problem with flexible layout pushing the entire layout to the left in certain fixed-width only configurations.

#879482 by mvc: Ensure Panels and CTools module files are loaded during update. Apparently could cause WSOD if not.

conflicts.

Conflicts:
	contexts/terms.inc
	docs/sample_plugin_ct.inc
	help/plugin-style.html
	help/plugins-style.html
	plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc
	plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php
	plugins/styles/corners/rounded_corners.inc
	plugins/styles/default.inc
	plugins/styles/list.inc

Catching HEAD back up with all the changes on DRUPAL-6--3. Now ready to move forward with the 7.x port!

Changed post-arg context build check to be aware of the fact that we now use error codes for argument plugins, and it should only load add'l contextual data if the return is an object (aka, isn't numeric)

Updated panels_load_include() to prevent the re-inclusion of already-loaded include files. Hackish, but eh.

Major cleanup, moved several more functions out to include files, removed some crufty ones. Also refactored the master loader itself some more.

Got rid of a leftover use of $panel_page->pid, and updated the alternate admin menu structure to the current approach.