Merge branch 'master' into develop
updated version to 2.6
Merge remote-tracking branch 'symfony/master' into develop

Conflicts:
	composer.json
Merge branch 'develop'