Modified composer.json
Merge branch '2.5'
Clean up
Merge branch 'master' of https://github.com/zebba/FilterBundle
Clean up
Merge branch '2.5'
Updated composer.json
Merge branch '2.5'