Fixed typos
updated version to 2.5
Merge remote-tracking branch 'symfony/master' into develop

Conflicts:
	composer.json
	src/main/php/ehough/filesystem/Filesystem.php
Merge branch 'develop'
Merge branch 'master' into develop