Merge branch 'release/1.0.7' into develop
customise admin to allow filtering by user
Merge branch 'develop' of github.com:praekelt/django-moderator