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

Conflicts:
	composer.json
Updating travis-ci config