added django-mptt for categories
cleanup noconflict
typo
admin fix