Make it work with Symfony 3.4

Merge pull request rmoreas#19 from vierbergenlars/symfony-3

Make bundle compatible with symfony 3

Merge pull request rmoreas#19 from vierbergenlars/symfony-3

Make bundle compatible with symfony 3

Merge pull request rmoreas#17 from vierbergenlars/patch-1

Do not conflict with ourself