Add django-braces to requirements
Merge branch 'filtered-paginate' into all-filtered