update knp-bundle dependencies
Merge branch 'sonata/master'

Conflicts:
	composer.json