reusing django jquery is a pita. just load your own copy.
Merge remote-tracking branch 'origin/master'

Conflicts:
	django_admin_blocks/templatetags/admin_blocks_tags.py