django.conf.urls.defaults -> django.conf.urls.
Fix jsbox formset usage.
Remove django.contrib.markup.
Merge branch 'develop' into feature/issue-931-django-1.6-compat
Merge branch 'feature/issue-932-django-1.6-compat' into develop