update Django
update makefile
Merge branch 'master' of github.com:mathiasertl/django-xmpp-server-list