Refactor Manager (https://github.com/sonata-project/SonataCoreBundle/commit/2391040a4d0f47cce1be2add4eb8089ad346f8ac)
Merge branch 'sonata-project/master'

Conflicts:
	composer.json