Merge branch 'hotfix/fix_entity_filter'
fix conflict
Merge branch 'master' of github.com:Tactics/TableBundle
Create a twig function that renders info about pager results.
Finish the pager_totals twig function.
Merge branch 'master' into develop