Merge branch '7.x' into 7.x-pimple
Merge branch '7.x' into 7.x-pimple
Merge branch '7.x' into 7.x-pimple
Merge branch '7.x' into 7.x-pimple
identify drupal scripts in composer.json.
use bootstrap interface to allow non-pimple bootstraps to work.
Merge branch '7.x-pimple' into 7.x-symfony

Conflicts:
	index.php