Update composer.json to use psr4
Fix autoload path
Update autoload.php.dist
Merge branch 'sonata-project/master'

Conflicts:
	composer.json