Support for Symfony 2.2+
Merge pull request #433 from MGaetan89/patch-2

Support for Symfony 2.2+
Merge branch 'sonata/master'

Conflicts:
	composer.json