Merge branch '7.x' into 7.x-pimple
add autoload info.
Merge branch '7.x-pimple' into 7.x-symfony

Conflicts:
	composer.json