Updated the bundle to configure the new factory extensions
Merge branch 'knp/master'

Conflicts:
	Resources/config/menu.xml