fixed symfony deps
Merge branch 'symfony-2.4' into 2.4
Updated composer.lock