Made SimpleJson optional#182

baseplate-admin wants to merge 6 commits intomodlinltd:developmodlinltd/django-advanced-filters:developfrom

baseplate-admin:developbaseplate-admin/django-advanced-filters:developCopy head branch name to clipboard