Symfony 2.2 compatibility
Merge pull request #337 from mweimerskirch/sf2_2

Symfony 2.2 compatibility