Allow symfony > 2.1
Merge remote-tracking branch 'upstream/develop' into symfony2.2-support
Merge pull request #776 from tommygnr/symfony2.2-support

Symfony2.2 support