Added Symfony 2.5 support
Merge branch 'release/2.5'

* release/2.5:
  Added Symfony 2.5 support