Fix SonataCoreBundle integration
Merge branch 'fix_core_bundle' of github.com:rande/SonataDoctrinePhpcrAdminBundle into update_to_latest_admin_bundle

Conflicts:
	composer.json