2eme commit
Merge branch 'master' of https://github.com/sdecalom/symfony