Merge branch 'master' of github.com:dangerdak/django-categories
Merge branch 'master' of github.com:dangerdak/django-categories