adjust to https://github.com/symfony-cmf/RoutingExtraBundle/pull/75
do the vendor update
Merge remote-tracking branch 'origin/master' into automatic-route-locales

Conflicts:
	composer.lock
Merge pull request #166 from symfony-cmf/automatic-route-locales

adjust to automatic locale handling