fix dep django-dajax
Merge branch 'develop'