Fix typo
Merge pull request #157 from erivello/patch-2

Fix typo
Fix regression
fix autoload for the tests
update autoload for the tests
fix test for php 5.4 version
Apply PHP-CS-Fixer
Fix error 'site is not defined'
Merge pull request #161 from gep/master

Fix error "Site in not defined in base_layout.html"
Merge pull request #159 from erivello/patch-4

fix autoload for the tests
Update composer.json
Update composer.json
Merge remote-tracking branch 'refs/remotes/sonata/master'
Merge remote-tracking branch 'refs/remotes/origin/master' into rmzamora-sonata-merge

Conflicts:
	composer.json
Merge branch 'refs/heads/rmzamora-sonata-merge' into rmzamora-master