Merge tag 'v2.5.7' of github.com:symfony/symfony-standard into develop

created tag 2.5.7

Conflicts:
	app/config/config.yml
	app/config/parameters.yml.dist