Merge branch '1.0.x'
Merge branch 'exblogs'
Merge branch '1.1.x'
Merge branch '1.1.x' of github.com:livinglab/openlab into 1.1.x
Fixes FeedWordPress pass-by-reference errors for PHP 5.4. Fixes #740
Merge branch '1.1.x' of github.com:livinglab/openlab into 1.1.x
Merge branch '1.1.x' of github.com:livinglab/openlab into 1.1.x
Adds bbg_debug_queries function
Merge branch '1.1.x' of github.com:livinglab/openlab into 1.1.x

Conflicts:
	wp-content/themes/edegree/header.php