Added bullets to custom toolbar.
Merge branch 'master' into non_image_uploads
Import `patterns`, `url` from `django.conf.urls`.

Was importing from `django.conf.urls.defaults`, which has been
deprecated and completely removed in django 1.6.
Merge branch 'django-1.6' into non_image_uploads