fixed filtering on sub-entities for sf 2.1
Merge pull request #999 from jonlil/master

fixed filter on sub-entities
Update composer.json
Update composer.json

Changing version of knp-menu-bundle
Fix translation preferred choices in TranslatableChoiceType form type.
Merge pull request #1009 from suslin/Fix-translatable-choice-type

Fix translation preferred choices in TranslatableChoiceType form type.
Merge pull request #1008 from empire/master

Knp-Menu-Bundle version is fixed
Improved docs for Inline Validation
Merge pull request #1011 from fazy/docs-update

Improved docs for Inline Validation
Fix block_name field descriptor always set to false
Merge pull request #1012 from andreadelfino/master

Fix block_name field descriptor always set to false
Wildcard not allowed in composer version range
Merge pull request #1014 from andreadelfino/master

Wildcard not allowed in composer version range
Move {% if admin_pool is defined %} up to catch another admin_pool usage
Persistent filters
Merge pull request #1019 from lopsided/master

Persistent filters
Merge pull request #1020 from mmucklo/master

Move admin_pool check up a few lines
Persistent filters - fix reset button
Merge pull request #1022 from lopsided/master

Persistent filters - fix reset button
Add missing dependency