Adding the latest
Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop