django.conf.urls.defaults -> django.conf.urls.
Fix jsbox formset usage.
Remove django.contrib.markup.
Add DejaVu font and associated LICENSE files.
Architecture diagram for user messaging.
Move frontend architecture drawing into dev folder.
Merge branch 'develop' into feature/issue-949-messaging-architecture-drawing
Merge branch 'develop' into feature/issue-949-messaging-architecture-drawing
Bump librabbitmq version since it claims to fix Linux install issues that appear to be affecting doc builds on readthedocs.
Update doc build requirements to match those in requirements.pip more closely (i.e. add externals for vxpolls and wikipedia and remove protobuf).
Merge branch 'develop' into feature/issue-949-messaging-architecture-drawing
Add site admin link.
Merge branch 'develop' into feature/issue-949-messaging-architecture-drawing

Conflicts:
	requirements-docs.pip
	setup.py
Merge branch 'feature/issue-947-architecture-diagram' into develop
Merge branch 'develop' into feature/issue-949-messaging-architecture-drawing
Merge branch 'develop' into feature/issue-931-django-1.6-compat
Merge branch 'feature/issue-932-django-1.6-compat' into develop
Add some missing arrows.
Merge branch 'feature/issue-949-messaging-architecture-drawing' into develop
Script for publishing releases to PyPI.